bump: rust 1.64.0

.github/workflows/ci.yml

@@ -83,7 +83,7 @@ jobs:
 
       - uses: Swatinem/rust-cache@v1
         if: matrix.os != 'windows-latest'
-        
+
       - name: Doctests
         uses: actions-rs/cargo@v1
         env:
@@ -141,7 +141,7 @@ jobs:
         uses: actions-rs/install@v0.1
         with:
           crate: mdbook
-          version: 0.4.7
+          version: 0.4.21
           use-tool-cache: true
 
       - name: mdbook test
@@ -186,33 +186,33 @@ jobs:
         with:
           command: build
           args: -p mun -p mun_runtime_capi
-          
+
       - name: Create build folder (debug)
         run: cmake -E make_directory ${{ runner.workspace }}/build/debug
-        
+
       - name: Create build folder (release)
         run: cmake -E make_directory ${{ runner.workspace }}/build/release
 
       - name: Configure cmake (debug)
         working-directory: ${{ runner.workspace }}/build/debug
         run: cmake -DCMAKE_BUILD_TYPE=Debug -S ${{ github.workspace }} -Dmun_build_examples=ON -Dmun_build_tests=ON -Dmun_binaries_path=${{ github.workspace }}/target/debug/ -Dmun_examples_path=${{ github.workspace }}/examples
-      
+
       - name: Configure cmake (release)
         working-directory: ${{ runner.workspace }}/build/release
         run: cmake -DCMAKE_BUILD_TYPE=Release -S ${{ github.workspace }} -Dmun_build_examples=ON -Dmun_build_tests=ON -Dmun_binaries_path=${{ github.workspace }}/target/debug/ -Dmun_examples_path=${{ github.workspace }}/examples
 
       - name: Build (debug)
         working-directory: ${{ runner.workspace }}/build/debug
         run: cmake --build . --config Debug
-        
+
       - name: Build (release)
         working-directory: ${{ runner.workspace }}/build/release
         run: cmake --build . --config Release
 
       - name: Test (debug)
         working-directory: ${{ runner.workspace }}/build/debug
         run: ctest -C Debug
-        
+
       - name: Test (release)
         working-directory: ${{ runner.workspace }}/build/release
         run: ctest -C Release

crates/mun_abi/src/dispatch_table.rs

@@ -20,7 +20,7 @@ impl<'a> DispatchTable<'a> {
         &mut self,
     ) -> impl Iterator<Item = (&mut *const c_void, &FunctionPrototype<'a>)> {
         if self.num_entries == 0 {
-            (&mut []).iter_mut().zip((&[]).iter())
+            ([]).iter_mut().zip(([]).iter())
         } else {
             let ptrs =
                 unsafe { slice::from_raw_parts_mut(self.fn_ptrs, self.num_entries as usize) };
@@ -34,7 +34,7 @@ impl<'a> DispatchTable<'a> {
     /// Returns an iterator over pairs of function pointers and signatures.
     pub fn iter(&self) -> impl Iterator<Item = (&*const c_void, &FunctionPrototype<'a>)> {
         if self.num_entries == 0 {
-            (&[]).iter().zip((&[]).iter())
+            ([]).iter().zip(([]).iter())
         } else {
             let ptrs =
                 unsafe { slice::from_raw_parts_mut(self.fn_ptrs, self.num_entries as usize) };

crates/mun_abi/src/type_lut.rs

@@ -34,7 +34,7 @@ impl<'a> TypeLut<'a> {
 
             (type_ids.iter(), ptrs.iter(), type_names.iter())
         } else {
-            ((&[]).iter(), (&[]).iter(), (&[]).iter())
+            (([]).iter(), ([]).iter(), ([]).iter())
         };
 
         izip!(type_ids, type_ptrs, type_names).map(|(id, ptr, type_name)| {
@@ -56,7 +56,7 @@ impl<'a> TypeLut<'a> {
 
             (type_ids.iter(), ptrs.iter_mut(), type_names.iter())
         } else {
-            ((&[]).iter(), (&mut []).iter_mut(), (&[]).iter())
+            (([]).iter(), ([]).iter_mut(), ([]).iter())
         };
 
         izip!(type_ids, type_ptrs, type_names).map(|(id, ptr, type_name)| {

crates/mun_compiler/src/db.rs

@@ -17,31 +17,31 @@ pub struct CompilerDatabase {
 
 impl Upcast<dyn mun_hir::AstDatabase> for CompilerDatabase {
     fn upcast(&self) -> &(dyn mun_hir::AstDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::SourceDatabase> for CompilerDatabase {
     fn upcast(&self) -> &(dyn mun_hir::SourceDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::DefDatabase> for CompilerDatabase {
     fn upcast(&self) -> &(dyn mun_hir::DefDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::HirDatabase> for CompilerDatabase {
     fn upcast(&self) -> &(dyn mun_hir::HirDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn CodeGenDatabase> for CompilerDatabase {
     fn upcast(&self) -> &(dyn CodeGenDatabase + 'static) {
-        &*self
+        self
     }
 }
 

crates/mun_hir/src/diagnostics.rs

@@ -39,10 +39,11 @@ impl dyn Diagnostic {
 }
 
 type DiagnosticCallback<'a> = Box<dyn FnMut(&dyn Diagnostic) -> Result<(), ()> + 'a>;
+type DefaultDiagnosticsCallback<'a> = Box<dyn FnMut(&dyn Diagnostic) + 'a>;
 
 pub struct DiagnosticSink<'a> {
     callbacks: Vec<DiagnosticCallback<'a>>,
-    default_callback: Box<dyn FnMut(&dyn Diagnostic) + 'a>,
+    default_callback: DefaultDiagnosticsCallback<'a>,
 }
 
 impl<'a> DiagnosticSink<'a> {

crates/mun_hir/src/path.rs

@@ -110,7 +110,7 @@ impl Path {
 fn lower_use_tree(
     prefix: Option<Path>,
     tree: &ast::UseTree,
-    cb: &mut dyn FnMut(Path, &ast::UseTree, bool, Option<ImportAlias>),
+    cb: &mut impl FnMut(Path, &ast::UseTree, bool, Option<ImportAlias>),
 ) {
     if let Some(use_tree_list) = tree.use_tree_list() {
         let prefix = match tree.path() {

crates/mun_language_server/src/db.rs

@@ -62,25 +62,25 @@ impl salsa::Database for AnalysisDatabase {
 
 impl Upcast<dyn mun_hir::AstDatabase> for AnalysisDatabase {
     fn upcast(&self) -> &(dyn mun_hir::AstDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::SourceDatabase> for AnalysisDatabase {
     fn upcast(&self) -> &(dyn mun_hir::SourceDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::DefDatabase> for AnalysisDatabase {
     fn upcast(&self) -> &(dyn mun_hir::DefDatabase + 'static) {
-        &*self
+        self
     }
 }
 
 impl Upcast<dyn mun_hir::HirDatabase> for AnalysisDatabase {
     fn upcast(&self) -> &(dyn mun_hir::HirDatabase + 'static) {
-        &*self
+        self
     }
 }
 

crates/mun_project/src/manifest.rs

@@ -5,20 +5,20 @@ use std::str::FromStr;
 mod toml;
 
 /// Contains all information of a package. Usually this information is read from a mun.toml file.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Manifest {
     package_id: PackageId,
     metadata: ManifestMetadata,
 }
 
 /// General metadata for a package.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ManifestMetadata {
     pub authors: Vec<String>,
 }
 
 /// Unique identifier of a package and version
-#[derive(PartialEq, Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PackageId {
     name: String,
     version: semver::Version,

crates/mun_project/src/package.rs

@@ -3,7 +3,7 @@ use semver::Version;
 use std::fmt;
 use std::path::{Path, PathBuf};
 
-#[derive(Clone, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Eq, Debug)]
 pub struct Package {
     // The manifest of the package
     manifest: Manifest,

crates/mun_target/src/spec.rs

@@ -14,7 +14,7 @@ pub enum LinkerFlavor {
 
 /// Everything Mun knows about a target.
 /// Every field must be specified, there are no default values.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Target {
     /// Target triple to pass to LLVM
     pub llvm_target: String,
@@ -33,7 +33,7 @@ pub struct Target {
 }
 
 /// Optional aspects of target specification.
-#[derive(PartialEq, Clone, Debug)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct TargetOptions {
     /// True if this is a built-in target
     pub is_builtin: bool,

rust-toolchain

@@ -1 +1 @@
-1.62
+1.64