bump: rust 1.73

crates/mun_abi/src/struct_info.rs

@@ -28,9 +28,11 @@ pub struct StructDefinition<'a> {
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize))]
+#[derive(Default)]
 pub enum StructMemoryKind {
     /// A garbage collected struct is allocated on the heap and uses reference semantics when passed
     /// around.
+    #[default]
     Gc,
 
     /// A value struct is allocated on the stack and uses value semantics when passed around.
@@ -78,12 +80,6 @@ impl<'a> StructDefinition<'a> {
     }
 }
 
-impl Default for StructMemoryKind {
-    fn default() -> Self {
-        StructMemoryKind::Gc
-    }
-}
-
 impl<'a> PartialEq for StructDefinition<'a> {
     fn eq(&self, other: &Self) -> bool {
         self.guid == other.guid

crates/mun_codegen/src/code_gen/context.rs

@@ -1,6 +1,7 @@
 use crate::{ir::ty::HirTypeCache, CodeGenDatabase};
 use inkwell::{context::Context, module::Module, targets::TargetMachine, types::StructType};
-use std::{cell::RefCell, collections::HashMap, sync::Arc};
+use std::rc::Rc;
+use std::{cell::RefCell, collections::HashMap};
 
 pub struct CodeGenContext<'db, 'ink> {
     /// The current LLVM context
@@ -19,7 +20,7 @@ pub struct CodeGenContext<'db, 'ink> {
     pub optimization_level: inkwell::OptimizationLevel,
 
     /// The target to generate code for
-    pub target_machine: Arc<TargetMachine>,
+    pub target_machine: Rc<TargetMachine>,
 }
 
 impl<'db, 'ink> CodeGenContext<'db, 'ink> {

crates/mun_codegen/src/db.rs

@@ -1,6 +1,7 @@
 use crate::{AssemblyIr, ModuleGroupId, ModulePartition, TargetAssembly};
 use by_address::ByAddress;
 use inkwell::targets::{CodeModel, InitializationConfig, RelocMode, Target, TargetTriple};
+use std::rc::Rc;
 use std::sync::Arc;
 
 /// The `CodeGenDatabase` enables caching of code generation stages. Inkwell/LLVM objects are not
@@ -23,7 +24,7 @@ pub trait CodeGenDatabase:
 
     /// Returns the inkwell target machine that completely describes the code generation target. All
     /// target-specific information should be accessible through this interface.
-    fn target_machine(&self) -> ByAddress<Arc<inkwell::targets::TargetMachine>>;
+    fn target_machine(&self) -> ByAddress<Rc<inkwell::targets::TargetMachine>>;
 
     /// Returns a file containing the IR for the specified module.
     #[salsa::invoke(crate::assembly::build_assembly_ir)]
@@ -36,7 +37,7 @@ pub trait CodeGenDatabase:
 
 /// Constructs the primary interface to the complete machine description for the target machine. All
 /// target-specific information should be accessible through this interface.
-fn target_machine(db: &dyn CodeGenDatabase) -> ByAddress<Arc<inkwell::targets::TargetMachine>> {
+fn target_machine(db: &dyn CodeGenDatabase) -> ByAddress<Rc<inkwell::targets::TargetMachine>> {
     // Get the HIR target
     let target = db.target();
 
@@ -61,5 +62,5 @@ fn target_machine(db: &dyn CodeGenDatabase) -> ByAddress<Arc<inkwell::targets::T
         )
         .expect("could not create llvm target machine");
 
-    ByAddress(Arc::new(target_machine))
+    ByAddress(Rc::new(target_machine))
 }

crates/mun_codegen/src/ir/type_table.rs

@@ -203,7 +203,7 @@ impl<'db, 'ink, 't> TypeTableBuilder<'db, 'ink, 't> {
 
     /// Constructs a `TypeTable` from all *used* types.
     pub fn build(self) -> TypeTable<'ink> {
-        let mut entries = Vec::from_iter(self.entries.into_iter());
+        let mut entries = Vec::from_iter(self.entries);
         entries.sort_by(|a, b| a.name.cmp(&b.name));
 
         let type_info_to_index = entries

crates/mun_codegen/src/value/float_value.rs

@@ -28,15 +28,15 @@
         context: &IrTypeContext<'ink, '_>,
         address_space: Option<AddressSpace>,
     ) -> PointerType<'ink> {
-        Self::get_ir_type(context).ptr_type(address_space.unwrap_or(AddressSpace::default()))
+        Self::get_ir_type(context).ptr_type(address_space.unwrap_or_default())
     }
 }
 impl<'ink> PointerValueType<'ink> for f64 {
     fn get_ptr_type(
         context: &IrTypeContext<'ink, '_>,
         address_space: Option<AddressSpace>,
     ) -> PointerType<'ink> {
-        Self::get_ir_type(context).ptr_type(address_space.unwrap_or(AddressSpace::default()))
+        Self::get_ir_type(context).ptr_type(address_space.unwrap_or_default())
     }
 }
 

crates/mun_codegen/src/value/global.rs

@@ -24,10 +24,7 @@ pub struct Global<'ink, T: ?Sized> {
 
 impl<'ink, T: ?Sized> Clone for Global<'ink, T> {
     fn clone(&self) -> Self {
-        Global {
-            value: self.value,
-            data: self.data,
-        }
+        *self
     }
 }
 

crates/mun_codegen/src/value/mod.rs

@@ -221,7 +221,7 @@
     }
 }
 
-impl_value_type_value! (
+impl_value_type_value!(
     inkwell::types::IntType<'ink> => inkwell::values::IntValue<'ink>,
     inkwell::types::FloatType<'ink> => inkwell::values::FloatValue<'ink>,
     inkwell::types::ArrayType<'ink> => inkwell::values::ArrayValue<'ink>,
@@ -333,7 +333,7 @@
 
 impl<'ink, T: ConcreteValueType<'ink> + ?Sized> Clone for Value<'ink, T> {
     fn clone(&self) -> Self {
-        Value { value: self.value }
+        *self
     }
 }
 

crates/mun_codegen/src/value/pointer_value.rs

@@ -25,7 +25,7 @@
         context: &IrTypeContext<'ink, '_>,
         address_space: Option<AddressSpace>,
     ) -> PointerType<'ink> {
-        Self::get_ir_type(context).ptr_type(address_space.unwrap_or(AddressSpace::default()))
+        Self::get_ir_type(context).ptr_type(address_space.unwrap_or_default())
     }
 }
 
@@ -53,7 +53,7 @@
         context: &IrTypeContext<'ink, '_>,
         address_space: Option<AddressSpace>,
     ) -> PointerType<'ink> {
-        Self::get_ir_type(context).ptr_type(address_space.unwrap_or(AddressSpace::default()))
+        Self::get_ir_type(context).ptr_type(address_space.unwrap_or_default())
     }
 }
 
@@ -62,7 +62,7 @@
         context: &IrTypeContext<'ink, '_>,
         address_space: Option<AddressSpace>,
     ) -> PointerType<'ink> {
-        Self::get_ir_type(context).ptr_type(address_space.unwrap_or(AddressSpace::default()))
+        Self::get_ir_type(context).ptr_type(address_space.unwrap_or_default())
     }
 }
 

crates/mun_codegen/tests/abi.rs

@@ -29,7 +29,7 @@ fn test_abi_compatibility() {
 
     assert_eq!(abi::ABI_VERSION, unsafe { lib.get_abi_version() });
     insta::assert_ron_snapshot!(unsafe { lib.get_info() },
-    @r###"
+    @r#"
     AssemblyInfo(
       symbols: ModuleInfo(
         path: "mod",
@@ -175,5 +175,5 @@ fn test_abi_compatibility() {
       ],
       dependencies: [],
     )
-    "###);
+    "#);
 }

crates/mun_hir/src/arena.rs

@@ -63,7 +63,7 @@
 
 impl<T> PartialOrd for Idx<T> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.raw.partial_cmp(&other.raw)
+        Some(self.cmp(other))
     }
 }
 

crates/mun_hir/src/ids.rs

@@ -16,6 +16,7 @@
         self.id == other.id
     }
 }
+
 impl<N: ItemTreeNode> Eq for ItemLoc<N> {}
 
 impl<N: ItemTreeNode> Hash for ItemLoc<N> {
@@ -26,9 +27,10 @@
 
 impl<N: ItemTreeNode> Clone for ItemLoc<N> {
     fn clone(&self) -> ItemLoc<N> {
-        ItemLoc { id: self.id }
+        *self
     }
 }
+
 impl<N: ItemTreeNode> Copy for ItemLoc<N> {}
 
 #[derive(Debug)]
@@ -39,10 +41,7 @@
 
 impl<N: ItemTreeNode> Clone for AssocItemLoc<N> {
     fn clone(&self) -> Self {
-        Self {
-            module: self.module,
-            id: self.id,
-        }
+        *self
     }
 }
 
@@ -105,6 +104,7 @@
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
 pub struct FunctionId(salsa::InternId);
+
 pub(crate) type FunctionLoc = AssocItemLoc<Function>;
 impl_intern!(
     FunctionId,
@@ -115,11 +115,13 @@
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct StructId(salsa::InternId);
+
 pub(crate) type StructLoc = AssocItemLoc<Struct>;
 impl_intern!(StructId, StructLoc, intern_struct, lookup_intern_struct);
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct TypeAliasId(salsa::InternId);
+
 pub(crate) type TypeAliasLoc = AssocItemLoc<TypeAlias>;
 impl_intern!(
     TypeAliasId,
@@ -152,21 +154,25 @@
         ItemDefinitionId::ModuleId(id)
     }
 }
+
 impl From<FunctionId> for ItemDefinitionId {
     fn from(id: FunctionId) -> Self {
         ItemDefinitionId::FunctionId(id)
     }
 }
+
 impl From<StructId> for ItemDefinitionId {
     fn from(id: StructId) -> Self {
         ItemDefinitionId::StructId(id)
     }
 }
+
 impl From<TypeAliasId> for ItemDefinitionId {
     fn from(id: TypeAliasId) -> Self {
         ItemDefinitionId::TypeAliasId(id)
     }
 }
+
 impl From<PrimitiveType> for ItemDefinitionId {
     fn from(id: PrimitiveType) -> Self {
         ItemDefinitionId::PrimitiveType(id)

crates/mun_hir/src/item_tree.rs

@@ -139,19 +139,18 @@
 
 impl<N: ItemTreeNode> Clone for LocalItemTreeId<N> {
     fn clone(&self) -> Self {
-        Self {
-            index: self.index,
-            _p: PhantomData,
-        }
+        *self
     }
 }
+
 impl<N: ItemTreeNode> Copy for LocalItemTreeId<N> {}
 
 impl<N: ItemTreeNode> PartialEq for LocalItemTreeId<N> {
     fn eq(&self, other: &Self) -> bool {
         self.index == other.index
     }
 }
+
 impl<N: ItemTreeNode> Eq for LocalItemTreeId<N> {}
 
 impl<N: ItemTreeNode> Hash for LocalItemTreeId<N> {

crates/mun_language_server/src/state/workspace.rs

@@ -82,7 +82,7 @@
         let monitor_config = mun_vfs::MonitorConfig {
             watch: match self.config.watcher {
                 FilesWatcher::Client => vec![],
-                FilesWatcher::Notify => (0..entries_to_load.len()).into_iter().collect(),
+                FilesWatcher::Notify => (0..entries_to_load.len()).collect(),
             },
             load: entries_to_load,
         };

crates/mun_memory/src/diff.rs

@@ -266,7 +266,7 @@ fn append_struct_mapping(
     // Any remaining unused deletions must have been deleted.
     used_deletions
         .into_iter()
-        .zip(deletions.into_iter())
+        .zip(deletions)
         .for_each(|(used, (_, old_index, ty, _))| {
             if !used {
                 mapping.push(StructDiff::Delete {
@@ -279,7 +279,7 @@ fn append_struct_mapping(
     // Any remaining unused insertions must have been inserted.
     used_insertions
         .into_iter()
-        .zip(insertions.into_iter())
+        .zip(insertions)
         .for_each(|(used, (_, new_index, ty, _))| {
             if !used {
                 mapping.push(StructDiff::Insert {

crates/mun_memory/src/gc/mark_sweep.rs

@@ -104,7 +104,7 @@
                         struct_type: ty.into_owned(),
                         field_index: 0,
                     }))
-                }
+                };
             }
             TypeKind::Array(_) => Some(TraceEvent::Reference(ptr.cast())),
         }
@@ -324,7 +324,12 @@
 
         unsafe {
             NonNull::new_unchecked(
-                (self.obj.as_ref().data.array.as_ptr().cast::<u8>() as *mut u8)
+                self.obj
+                    .as_ref()
+                    .data
+                    .array
+                    .as_ptr()
+                    .cast::<u8>()
                     .add(padded_header_size),
             )
         }
@@ -934,8 +939,8 @@
                 mapping::Action::StructMapFromGc { old_ty, old_offset } => {
                     let conversion = conversions.get(old_ty).unwrap_or_else(|| {
                         panic!(
-                        "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
-                    )
+                            "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
+                        )
                     });
 
                     // Safety: we already hold a write lock on `objects`, so this is legal.
@@ -960,8 +965,8 @@
 
                     let conversion = conversions.get(old_ty).unwrap_or_else(|| {
                         panic!(
-                        "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
-                    )
+                            "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
+                        )
                     });
 
                     // Map in-memory struct to heap-allocated struct
@@ -986,8 +991,8 @@
                 mapping::Action::StructMapInPlace { old_ty, old_offset } => {
                     let conversion = conversions.get(old_ty).unwrap_or_else(|| {
                         panic!(
-                        "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
-                    )
+                            "If the struct changed, there must also be a conversion for type: {old_ty:#?}.",
+                        )
                     });
 
                     map_struct(
@@ -1063,6 +1068,7 @@
 
 /// An `ObjectInfo` is thread-safe.
 unsafe impl Send for ObjectInfo {}
+
 unsafe impl Sync for ObjectInfo {}
 
 impl From<GcPtr> for *const ObjectInfo {