bump: rust to 1.52.0

baszalmstra · baszalmstra · commit 4007add36df6 · 2021-05-08T10:20:58.000+02:00
diff --git a/crates/mun_codegen/src/code_gen/assembly_builder.rs b/crates/mun_codegen/src/code_gen/assembly_builder.rs
@@ -29,9 +29,9 @@ impl<'db, 'ink, 'ctx, 't> AssemblyBuilder<'db, 'ink, 'ctx, 't> {
 
         Self {
             code_gen,
+            module_group_partition,
             module_group_id,
             assembly_module,
-            module_group_partition,
         }
     }
 
diff --git a/crates/mun_codegen/src/module_group.rs b/crates/mun_codegen/src/module_group.rs
@@ -53,9 +53,9 @@ impl ModuleGroup {
 
         Self {
             ordered_modules,
-            name,
-            includes_entire_subtree,
             modules,
+            includes_entire_subtree,
+            name,
         }
     }
 
diff --git a/crates/mun_hir/src/module_tree.rs b/crates/mun_hir/src/module_tree.rs
@@ -110,10 +110,10 @@ impl ModuleTree {
         }
 
         Arc::new(ModuleTree {
+            root,
+            modules,
             package,
             diagnostics,
-            modules,
-            root,
         })
     }
 
diff --git a/crates/mun_hir/src/name_resolution/path_resolution.rs b/crates/mun_hir/src/name_resolution/path_resolution.rs
@@ -41,8 +41,8 @@ impl ResolvePathResult {
     ) -> ResolvePathResult {
         ResolvePathResult {
             resolved_def,
-            reached_fixedpoint,
             segment_index,
+            reached_fixedpoint,
             package,
         }
     }
diff --git a/crates/mun_language_server/src/state.rs b/crates/mun_language_server/src/state.rs
@@ -347,10 +347,7 @@ impl LanguageServerState {
                 .file_contents(file.file_id)
                 .map(Vec::from)
                 .unwrap_or_default();
-            let text = match String::from_utf8(bytes).ok() {
-                Some(text) => Some(Arc::from(text)),
-                None => None,
-            };
+            let text = String::from_utf8(bytes).ok().map(Arc::from);
 
             // Notify the database about this change
             analysis_change.change_file(hir::FileId(file.file_id.0), text);
diff --git a/crates/mun_memory/src/diff.rs b/crates/mun_memory/src/diff.rs
@@ -131,6 +131,7 @@ fn append_primitive_mapping<T>(
     let mut insertions: Vec<Option<usize>> = insertions.into_iter().map(Some).collect();
 
     // For all deletions,
+    #[allow(clippy::manual_flatten)]
     'outer: for old_idx in deletions {
         let old_ty = unsafe { old.get_unchecked(old_idx) };
         // is there an insertion
@@ -154,10 +155,8 @@ fn append_primitive_mapping<T>(
     }
 
     // If an insertion did not have a matching deletion, then `Insert` it.
-    for insertion in insertions {
-        if let Some(index) = insertion {
-            mapping.push(Diff::Insert { index });
-        }
+    for index in insertions.into_iter().flatten() {
+        mapping.push(Diff::Insert { index });
     }
 }
 
@@ -296,6 +295,7 @@ where
 
     let mut mapping = Vec::with_capacity(diff.len());
     // For all deletions,
+    #[allow(clippy::manual_flatten)]
     'outer: for old_idx in deletions {
         let old_ty = unsafe { old.get_unchecked(old_idx) };
         // is there an insertion with the same name and type `T`?
@@ -391,10 +391,8 @@ where
     }
 
     // If an insertion did not have a matching deletion, then insert it.
-    for insertion in insertions {
-        if let Some(index) = insertion {
-            mapping.push(FieldDiff::Insert { index });
-        }
+    for index in insertions.into_iter().flatten() {
+        mapping.push(FieldDiff::Insert { index });
     }
 
     mapping.shrink_to_fit();
diff --git a/crates/mun_runtime/src/adt.rs b/crates/mun_runtime/src/adt.rs
@@ -310,7 +310,7 @@ impl RootedStruct {
             GcRootPtr::new(&runtime_ref.gc, raw.0)
         };
 
-        Self { runtime, handle }
+        Self { handle, runtime }
     }
 
     /// Converts the `RootedStruct` into a `StructRef`, using an external shared reference to a
diff --git a/crates/mun_syntax/src/ast/expr_extensions.rs b/crates/mun_syntax/src/ast/expr_extensions.rs
@@ -176,10 +176,8 @@ impl ast::FieldExpr {
     pub fn field_access(&self) -> Option<FieldKind> {
         if let Some(nr) = self.name_ref() {
             Some(FieldKind::Name(nr))
-        } else if let Some(tok) = self.index_token() {
-            Some(FieldKind::Index(tok))
         } else {
-            None
+            self.index_token().map(FieldKind::Index)
         }
     }
 
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.51.0
+1.52.0

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ impl<'db, 'ink, 'ctx, 't> AssemblyBuilder<'db, 'ink, 'ctx, 't> {`
`29`	`29`
`30`	`30`	`Self {`
`31`	`31`	`code_gen,`
	`32`	`+ module_group_partition,`
`32`	`33`	`module_group_id,`
`33`	`34`	`assembly_module,`
`34`		`- module_group_partition,`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,9 @@ impl ModuleGroup {`
`53`	`53`
`54`	`54`	`Self {`
`55`	`55`	`ordered_modules,`
`56`		`- name,`
`57`		`- includes_entire_subtree,`
`58`	`56`	`modules,`
	`57`	`+ includes_entire_subtree,`
	`58`	`+ name,`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,10 @@ impl ModuleTree {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`Arc::new(ModuleTree {`
	`113`	`+ root,`
	`114`	`+ modules,`
`113`	`115`	`package,`
`114`	`116`	`diagnostics,`
`115`		`- modules,`
`116`		`- root,`
`117`	`117`	`})`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,8 @@ impl ResolvePathResult {`
`41`	`41`	`) -> ResolvePathResult {`
`42`	`42`	`ResolvePathResult {`
`43`	`43`	`resolved_def,`
`44`		`- reached_fixedpoint,`
`45`	`44`	`segment_index,`
	`45`	`+ reached_fixedpoint,`
`46`	`46`	`package,`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ impl RootedStruct {`
`310`	`310`	`GcRootPtr::new(&runtime_ref.gc, raw.0)`
`311`	`311`	`};`
`312`	`312`
`313`		`- Self { runtime, handle }`
	`313`	`+ Self { handle, runtime }`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	/// Converts the `RootedStruct` into a `StructRef`, using an external shared reference to a
Original file line number	Diff line number	Diff line change
`@@ -176,10 +176,8 @@ impl ast::FieldExpr {`
`176`	`176`	`pub fn field_access(&self) -> Option<FieldKind> {`
`177`	`177`	`if let Some(nr) = self.name_ref() {`
`178`	`178`	`Some(FieldKind::Name(nr))`
`179`		`- } else if let Some(tok) = self.index_token() {`
`180`		`- Some(FieldKind::Index(tok))`
`181`	`179`	`} else {`
`182`		`- None`
	`180`	`+ self.index_token().map(FieldKind::Index)`
`183`	`181`	`}`
`184`	`182`	`}`
`185`	`183`