Update toolchain to 1.72 (#38)

automerge · Sep 1, 2023 · abbd080 · abbd080
1 parent f1c07b3
commit abbd080
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           default: true
           components: rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -29,7 +29,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           default: true
           components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         toolchain:
-          - 1.70.0
+          - 1.72.0
           - nightly
     continue-on-error: ${{ matrix.toolchain == 'nightly' }}
     steps:
@@ -77,7 +77,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           default: true
       - uses: Swatinem/rust-cache@v2
       - run: ./scripts/ci/build-test
@@ -90,7 +90,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.70.0
+          toolchain: 1.72.0
           default: true
       - uses: Swatinem/rust-cache@v2
       - run: ./scripts/ci/build-test

diff --git a/autosurgeon-derive/tests/reconcile.rs b/autosurgeon-derive/tests/reconcile.rs
@@ -406,7 +406,7 @@ fn reconcile_struct_enum_key() {
             manufacturer: "Audi".to_string(),
         },
     );
-    let Vehicle::Truck{num_wheels, ..} = &mut vehicles[2] else {
+    let Vehicle::Truck { num_wheels, .. } = &mut vehicles[2] else {
         panic!("should be a truck");
     };
     *num_wheels = 20;

diff --git a/autosurgeon/src/hydrate.rs b/autosurgeon/src/hydrate.rs
@@ -148,7 +148,7 @@ pub fn hydrate_path<'a, D: ReadDoc, H: Hydrate, P: IntoIterator<Item = Prop<'a>>
         }
     };
     let Some(mut obj_type) = doc.object_type(&obj) else {
-        return Ok(None)
+        return Ok(None);
     };
     while let Some(path_elem) = path.next() {
         match (&prop, obj_type) {
@@ -383,22 +383,22 @@ mod tests {
             }],
         };
         let result: HashMap<String, Company> =
-            hydrate_path(&doc, &automerge::ROOT, vec!["companies".into()].into_iter())
+            hydrate_path(&doc, &automerge::ROOT, vec!["companies".into()])
                 .unwrap()
                 .unwrap();
         let mut expected = HashMap::new();
         expected.insert("Microsoft".to_string(), expected_ms.clone());
         assert_eq!(expected, result);
 
-        let result: Company = hydrate_path(&doc, &companies, vec!["Microsoft".into()].into_iter())
+        let result: Company = hydrate_path(&doc, &companies, vec!["Microsoft".into()])
             .unwrap()
             .unwrap();
         assert_eq!(result, expected_ms);
 
         let satya: Employee = hydrate_path(
             &doc,
             &companies,
-            vec!["Microsoft".into(), "employees".into(), 0_usize.into()].into_iter(),
+            vec!["Microsoft".into(), "employees".into(), 0_usize.into()],
         )
         .unwrap()
         .unwrap();
@@ -412,8 +412,7 @@ mod tests {
                 "employees".into(),
                 0_usize.into(),
                 "name".into(),
-            ]
-            .into_iter(),
+            ],
         )
         .unwrap()
         .unwrap();
@@ -426,7 +425,7 @@ mod tests {
         doc.put(&automerge::ROOT, "name", "Moist von Lipwig")
             .unwrap();
         doc.put(&automerge::ROOT, "number", 1_u64).unwrap();
-        let moist = hydrate_path::<_, Employee, _>(&doc, &automerge::ROOT, vec![].into_iter())
+        let moist = hydrate_path::<_, Employee, _>(&doc, &automerge::ROOT, vec![])
             .unwrap()
             .unwrap();
         assert_eq!(
@@ -446,7 +445,7 @@ mod tests {
             .unwrap();
         doc.put(&moist, "name", "Moist von Lipwig").unwrap();
         doc.put(&moist, "number", 1_u64).unwrap();
-        let moist = hydrate_path::<_, Employee, _>(&doc, &moist, vec![].into_iter())
+        let moist = hydrate_path::<_, Employee, _>(&doc, &moist, vec![])
             .unwrap()
             .unwrap();
         assert_eq!(

diff --git a/autosurgeon/src/hydrate/map.rs b/autosurgeon/src/hydrate/map.rs
@@ -45,7 +45,10 @@ where
     M: FromIterator<(K, V)>,
 {
     let Some(obj_type) = doc.object_type(obj) else {
-        return Err(HydrateError::unexpected("a map", "a scalar value".to_string()))
+        return Err(HydrateError::unexpected(
+            "a map",
+            "a scalar value".to_string(),
+        ));
     };
     match obj_type {
         ObjType::Map | ObjType::Table => doc