Simplify rustfmt config and switch to stable rustfmt (#242)

Author: davepacheco

.github/workflows/rust.yml

@@ -14,17 +14,12 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@230611dbd0eb52da1e1f4f7bc8bb0c3a339fc8b7
-      - uses: actions-rs/toolchain@88dc2356392166efad76775c878094f4e83ff746
-        with:
-          toolchain: nightly-2021-03-25
-          default: false
-          components: rustfmt
       - name: Report cargo version
-        run: cargo +nightly-2021-03-25 --version
+        run: cargo --version
       - name: Report rustfmt version
-        run: cargo +nightly-2021-03-25 fmt -- --version
+        run: cargo fmt -- --version
       - name: Check style
-        run: cargo +nightly-2021-03-25 fmt -- --check
+        run: cargo fmt -- --check
 
   clippy-lint:
     runs-on: ubuntu-18.04
@@ -44,11 +39,6 @@ jobs:
         os: [ubuntu-18.04, windows-2019, macos-10.15]
     steps:
       - uses: actions/checkout@230611dbd0eb52da1e1f4f7bc8bb0c3a339fc8b7
-      # Temporary fork until https://github.com/actions-rs/toolchain/pull/209 is merged
-      - uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36
-        with:
-          profile: minimal
-          override: true
       - name: Report cargo version
         run: cargo --version
       - name: Report rustc version

.vscode/settings.json

@@ -15,34 +15,16 @@ You can build the documentation yourself with:
 $ cargo +nightly doc
 ----
 
-
 == Contributing
 
-For maintainers (e.g., publishing new releases and managing dependabot), see link:./MAINTAINERS.adoc[MAINTAINERS.adoc].
-
-=== Building and testing
-
 You can **build and run the whole test suite** with `cargo test`.  The test
 suite runs cleanly and should remain clean.
 
-=== Code formatting and lint
-
-Dropshot works with stable Rust versions, but for consistency the code is
-_formatted_ with a specific version of `rustfmt`.  To contribute to Dropshot,
-you will need to have installed the `nightly-2021-03-25` version of the Rust
-toolchain:
-
-----
-$ rustup install nightly-2021-03-25
-----
-
-You can then **format the code** using `cargo +nightly-2021-03-25 fmt` or
-`rustfmt +nightly-2021-03-25`.  Make sure to run this before pushing changes.
-The CI uses this version of `rustfmt` to check that the code is correctly
-formatted.
+You can format the code using `cargo fmt`.  CI checks that code is correctly formatted.
 
 https://github.com/rust-lang/rust-clippy[Clippy] is used to check for common code issues.  (We disable the style checks.)  You can run it with `cargo clippy`.  CI will run clippy as well.
 
+For maintainers (e.g., publishing new releases and managing dependabot), see link:./MAINTAINERS.adoc[MAINTAINERS.adoc].
 
 == Configuration reference
 

README.adoc

@@ -35,9 +35,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -82,9 +81,7 @@ impl ExampleContext {
      * Return a new ExampleContext.
      */
     pub fn new() -> ExampleContext {
-        ExampleContext {
-            counter: AtomicU64::new(0),
-        }
+        ExampleContext { counter: AtomicU64::new(0) }
     }
 }
 

dropshot/examples/basic.rs

@@ -35,9 +35,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -51,9 +50,7 @@ async fn main() -> Result<(), String> {
     /*
      * Specify the directory we want to serve.
      */
-    let context = FileServerContext {
-        base: PathBuf::from("."),
-    };
+    let context = FileServerContext { base: PathBuf::from(".") };
 
     /*
      * Set up the server.

dropshot/examples/file_server.rs

@@ -83,9 +83,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -130,9 +129,7 @@ impl ExampleContext {
      * Return a new ExampleContext.
      */
     pub fn new() -> ExampleContext {
-        ExampleContext {
-            counter: AtomicU64::new(0),
-        }
+        ExampleContext { counter: AtomicU64::new(0) }
     }
 }
 

dropshot/examples/https.rs

@@ -31,9 +31,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;

dropshot/examples/index.rs

@@ -26,9 +26,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -73,9 +72,7 @@ impl ExampleContext {
      * Return a new ExampleContext.
      */
     pub fn new() -> ExampleContext {
-        ExampleContext {
-            counter: AtomicU64::new(0),
-        }
+        ExampleContext { counter: AtomicU64::new(0) }
     }
 }
 

dropshot/examples/module-basic.rs

@@ -34,9 +34,8 @@ async fn main() -> Result<(), String> {
      * For simplicity, we'll configure an "info"-level logger that writes to
      * stderr assuming that it's a terminal.
      */
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Info,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Info };
     let log = config_logging
         .to_logger("example-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -102,9 +101,7 @@ impl ExampleContext {
      * Return a new ExampleContext.
      */
     pub fn new() -> ExampleContext {
-        ExampleContext {
-            counter: AtomicU64::new(0),
-        }
+        ExampleContext { counter: AtomicU64::new(0) }
     }
 }
 

dropshot/examples/module-shared-context.rs

@@ -91,9 +91,7 @@ async fn example_list_projects(
                 .map(|(_, project)| project.clone())
                 .collect()
         }
-        WhichPage::Next(ProjectPage {
-            name: last_seen,
-        }) => {
+        WhichPage::Next(ProjectPage { name: last_seen }) => {
             /* Return a list of the first "limit" projects after this name. */
             tree.range((Bound::Excluded(last_seen.clone()), Bound::Unbounded))
                 .take(limit)
@@ -105,9 +103,7 @@ async fn example_list_projects(
     Ok(HttpResponseOk(ResultsPage::new(
         projects,
         &EmptyScanParams {},
-        |p: &Project, _| ProjectPage {
-            name: p.name.clone(),
-        },
+        |p: &Project, _| ProjectPage { name: p.name.clone() },
     )?))
 }
 
@@ -126,9 +122,7 @@ async fn main() -> Result<(), String> {
     let mut tree = BTreeMap::new();
     for n in 1..1000 {
         let name = format!("project{:03}", n);
-        let project = Project {
-            name: name.clone(),
-        };
+        let project = Project { name: name.clone() };
         tree.insert(name, project);
     }
 
@@ -140,9 +134,8 @@ async fn main() -> Result<(), String> {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
         ..Default::default()
     };
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Debug,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Debug };
     let log = config_logging
         .to_logger("example-pagination-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;

dropshot/examples/pagination-basic.rs

@@ -119,27 +119,25 @@ fn page_selector<T: HasIdentity>(
     scan_params: &ExScanParams,
 ) -> ExPageSelector {
     match scan_params {
-        ExScanParams {
-            sort: ExSortMode::ByIdAscending,
-        } => ExPageSelector::Id(Ascending, *item.id()),
-        ExScanParams {
-            sort: ExSortMode::ByIdDescending,
-        } => ExPageSelector::Id(Descending, *item.id()),
-        ExScanParams {
-            sort: ExSortMode::ByNameAscending,
-        } => ExPageSelector::Name(Ascending, item.name().to_string()),
-        ExScanParams {
-            sort: ExSortMode::ByNameDescending,
-        } => ExPageSelector::Name(Descending, item.name().to_string()),
+        ExScanParams { sort: ExSortMode::ByIdAscending } => {
+            ExPageSelector::Id(Ascending, *item.id())
+        }
+        ExScanParams { sort: ExSortMode::ByIdDescending } => {
+            ExPageSelector::Id(Descending, *item.id())
+        }
+        ExScanParams { sort: ExSortMode::ByNameAscending } => {
+            ExPageSelector::Name(Ascending, item.name().to_string())
+        }
+        ExScanParams { sort: ExSortMode::ByNameDescending } => {
+            ExPageSelector::Name(Descending, item.name().to_string())
+        }
     }
 }
 
 fn scan_params(p: &WhichPage<ExScanParams, ExPageSelector>) -> ExScanParams {
     ExScanParams {
         sort: match p {
-            WhichPage::First(ExScanParams {
-                sort,
-            }) => sort.clone(),
+            WhichPage::First(ExScanParams { sort }) => sort.clone(),
 
             WhichPage::Next(ExPageSelector::Id(Ascending, ..)) => {
                 ExSortMode::ByIdAscending
@@ -297,9 +295,8 @@ async fn main() -> Result<(), String> {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
         ..Default::default()
     };
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Debug,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Debug };
     let log = config_logging
         .to_logger("example-pagination-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -346,26 +343,20 @@ impl DataCollection {
         };
         for n in 1..1000 {
             let pname = format!("project{:03}", n);
-            let project = Arc::new(Project {
-                id: Uuid::new_v4(),
-                name: pname.clone(),
-            });
+            let project =
+                Arc::new(Project { id: Uuid::new_v4(), name: pname.clone() });
             data.projects_by_name.insert(pname.clone(), Arc::clone(&project));
             data.projects_by_id.insert(project.id, project);
 
             let dname = format!("disk{:03}", n);
-            let disk = Arc::new(Disk {
-                id: Uuid::new_v4(),
-                name: dname.clone(),
-            });
+            let disk =
+                Arc::new(Disk { id: Uuid::new_v4(), name: dname.clone() });
             data.disks_by_name.insert(dname.clone(), Arc::clone(&disk));
             data.disks_by_id.insert(disk.id, disk);
 
             let iname = format!("disk{:03}", n);
-            let instance = Arc::new(Instance {
-                id: Uuid::new_v4(),
-                name: iname.clone(),
-            });
+            let instance =
+                Arc::new(Instance { id: Uuid::new_v4(), name: iname.clone() });
             data.instances_by_name.insert(iname.clone(), Arc::clone(&instance));
             data.instances_by_id.insert(instance.id, instance);
         }

dropshot/examples/pagination-multiple-resources.rs

@@ -241,9 +241,7 @@ async fn example_list_projects(
     let data = rqctx.context();
     let scan_params = ProjectScanParams {
         sort: match &pag_params.page {
-            WhichPage::First(ProjectScanParams {
-                sort,
-            }) => sort.clone(),
+            WhichPage::First(ProjectScanParams { sort }) => sort.clone(),
 
             WhichPage::Next(ProjectScanPageSelector::Name(Ascending, ..)) => {
                 ProjectSort::ByNameAscending
@@ -313,9 +311,8 @@ async fn main() -> Result<(), String> {
         bind_address: SocketAddr::from((Ipv4Addr::LOCALHOST, port)),
         ..Default::default()
     };
-    let config_logging = ConfigLogging::StderrTerminal {
-        level: ConfigLoggingLevel::Debug,
-    };
+    let config_logging =
+        ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Debug };
     let log = config_logging
         .to_logger("example-pagination-basic")
         .map_err(|error| format!("failed to create logger: {}", error))?;
@@ -341,9 +338,7 @@ fn print_example_requests(log: slog::Logger, addr: &SocketAddr) {
         ProjectSort::ByMtimeDescending,
     ];
     for mode in all_modes {
-        let to_print = ProjectScanParams {
-            sort: mode,
-        };
+        let to_print = ProjectScanParams { sort: mode };
         let query_string = serde_urlencoded::to_string(to_print).unwrap();
         let uri = Uri::builder()
             .scheme("http")

dropshot/examples/pagination-multiple-sorts.rs

@@ -156,9 +156,7 @@ async fn find_pets_by_tags(
                 tags: None,
                 status: None,
             };
-            tmp = FindByTagsScanParams {
-                tags: page_selector.tags.clone(),
-            };
+            tmp = FindByTagsScanParams { tags: page_selector.tags.clone() };
             (vec![pet], &tmp)
         }
     };