Use nightly for rustfmt in CI

.github/workflows/test.yml

@@ -28,6 +28,7 @@ jobs:
       - name: Rustfmt
         uses: actions-rs/cargo@v1
         with:
+          toolchain: nightly-2023-09-20 # Semi-arbitrary
           command: fmt
           args: -- --check
 

.rustfmt.toml

@@ -1,4 +1,4 @@
 max_width = 80
 # these two are only available on nightly (F)
-merge_imports = true
+imports_granularity = "crate"
 wrap_comments = true

src/cli.rs

@@ -134,12 +134,10 @@ impl Subcommand {
                             .truncate(true)
                             .write(true)
                             .open(&output_file)
-                            .with_context(|| {
-                                format!(
-                                    "Error opening collection output file \
+                            .context(format!(
+                                "Error opening collection output file \
                                 {output_file:?}"
-                                )
-                            })?,
+                            ))?,
                     ),
                     None => Box::new(io::stdout()),
                 };

src/collection.rs

@@ -214,7 +214,7 @@ impl RequestCollection<PathBuf> {
 
         Ok(future
             .await
-            .with_context(|| format!("Error loading collection from {path:?}"))?
+            .context(format!("Error loading collection from {path:?}"))?
             .with_source(path))
     }
 

src/collection/insomnia.rs

@@ -27,17 +27,14 @@ impl RequestCollection<()> {
             is meant to give you a skeleton for a Slumber collection, and \
             nothing more."
         );
-        let file = File::open(insomnia_file).with_context(|| {
-            format!("Error opening Insomnia collection file {insomnia_file:?}")
-        })?;
+        let file = File::open(insomnia_file).context(format!(
+            "Error opening Insomnia collection file {insomnia_file:?}"
+        ))?;
         // The format can be YAML or JSON, so we can just treat it all as YAML
         let insomnia: Insomnia =
-            serde_yaml::from_reader(file).with_context(|| {
-                format!(
-                    "Error deserializing Insomnia collection file\
-                    {insomnia_file:?}"
-                )
-            })?;
+            serde_yaml::from_reader(file).context(format!(
+                "Error deserializing Insomnia collection file {insomnia_file:?}"
+            ))?;
 
         // Convert everything
         let mut profiles = Vec::new();

src/http.rs

@@ -315,12 +315,12 @@ impl RequestBuilder {
             // String -> header conversions are fallible, if headers
             // are invalid
             Ok::<(HeaderName, HeaderValue), anyhow::Error>((
-                header.try_into().with_context(|| {
-                    format!("Error parsing header name `{header}`")
-                })?,
-                value.try_into().with_context(|| {
-                    format!("Error parsing value for header `{header}`")
-                })?,
+                header
+                    .try_into()
+                    .context(format!("Error parsing header name `{header}`"))?,
+                value.try_into().context(format!(
+                    "Error parsing value for header `{header}`"
+                ))?,
             ))
         });
         Ok(future::try_join_all(iter)

src/http/repository.rs

@@ -47,8 +47,6 @@ pub struct Repository {
 impl Repository {
     /// Load the repository database. This will perform first-time setup, so
     /// this should only be called at the main session entrypoint.
-    ///
-    /// Each collection gets its own
     pub fn load(collection_id: &CollectionId) -> anyhow::Result<Self> {
         let mut connection = Connection::open(Self::path(collection_id))?;
         // Use WAL for concurrency