Merge remote-tracking branch 'origin/main' into feat/rustfmt

crates/mun_abi/src/type_info.rs

@@ -114,9 +114,7 @@ impl<'a> TypeDefinition<'a> {
 
     /// Returns the alignment of the type in bytes
     pub fn alignment(&self) -> usize {
-        self.alignment
-            .try_into()
-            .expect("cannot convert alignment to platform size")
+        self.alignment.into()
     }
 }
 

crates/mun_hir/src/arena.rs

@@ -134,9 +134,7 @@ impl<T> Arena<T> {
     }
 
     /// Iterate over the elements in the arena
-    pub fn iter(
-        &self,
-    ) -> impl Iterator<Item = (Idx<T>, &T)> + ExactSizeIterator + DoubleEndedIterator {
+    pub fn iter(&self) -> impl ExactSizeIterator<Item = (Idx<T>, &T)> + DoubleEndedIterator {
         self.data
             .iter()
             .enumerate()

crates/mun_hir/src/code_model.rs

@@ -12,8 +12,8 @@ pub use self::{
     function::{Function, FunctionData},
     module::{Module, ModuleDef},
     package::Package,
-    r#impl::{Impl, ImplData},
-    r#struct::{Field, FieldData, LocalFieldId, Struct, StructData, StructKind, StructMemoryKind},
+    r#impl::ImplData,
+    r#struct::{Field, Struct, StructData, StructKind, StructMemoryKind},
     src::HasSource,
     type_alias::{TypeAlias, TypeAliasData},
 };

crates/mun_hir/src/item_scope.rs

@@ -84,12 +84,12 @@ impl ItemScope {
     }
 
     /// Returns an iterator over all declarations with this scope
-    pub fn declarations(&self) -> impl Iterator<Item = ItemDefinitionId> + ExactSizeIterator + '_ {
+    pub fn declarations(&self) -> impl ExactSizeIterator<Item = ItemDefinitionId> + '_ {
         self.defs.iter().copied()
     }
 
     /// Returns an iterator over all impls in this scope
-    pub fn impls(&self) -> impl Iterator<Item = ImplId> + ExactSizeIterator + '_ {
+    pub fn impls(&self) -> impl ExactSizeIterator<Item = ImplId> + '_ {
         self.impls.iter().copied()
     }
 

crates/mun_hir/src/ty/infer.rs

@@ -22,8 +22,6 @@ mod place_expr;
 mod type_variable;
 mod unify;
 
-pub use type_variable::TypeVarId;
-
 use crate::{
     expr::{LiteralFloat, LiteralFloatKind, LiteralInt, LiteralIntKind},
     ids::DefWithBodyId,

crates/mun_runtime/src/dispatch_table.rs

@@ -17,7 +17,7 @@ impl DispatchTable {
     /// Retrieves the [`FunctionDefinition`] corresponding to `fn_path`, if it
     /// exists.
     pub fn get_fn(&self, fn_path: &str) -> Option<Arc<FunctionDefinition>> {
-        self.functions.get(fn_path).map(Clone::clone)
+        self.functions.get(fn_path).cloned()
     }
 
     /// Retrieves the name of all available functions.

crates/mun_runtime/src/lib.rs

@@ -694,10 +694,6 @@ impl<'name, T: InvokeArgs> InvokeErr<'name, T> {
         Output: 'o + ReturnTypeReflection + Marshal<'o>,
         'r: 'o,
     {
-        // Safety: The output of `retry_impl` is guaranteed to only contain a shared
-        // reference.
-        let runtime = &*runtime;
-
         loop {
             self = match unsafe { self.retry_impl(runtime) } {
                 Ok(output) => return output,
@@ -712,16 +708,15 @@ impl<'name, T: InvokeArgs> InvokeErr<'name, T> {
     ///
     /// # Safety
     ///
-    /// When calling this function, you have to guarantee that `runtime` is
-    /// mutably borrowed. The `Output` value can only contain a shared
-    /// borrow of `runtime`.
-    unsafe fn retry_impl<'r, 'o, Output>(self, runtime: &'r Runtime) -> Result<Output, Self>
+    /// When calling this function, you have to guarantee that `runtime` can be
+    /// dereferenced and is valid for `'o`. The `Output` value can only
+    /// contain a shared borrow of `runtime`.
+    unsafe fn retry_impl<'o, Output>(self, runtime: *mut Runtime) -> Result<Output, Self>
     where
         Output: 'o + ReturnTypeReflection + Marshal<'o>,
-        'r: 'o,
     {
-        #[allow(invalid_reference_casting, invalid_reference_casting)]
-        let runtime = &mut *(runtime as *const Runtime as *mut Runtime);
+        // Safety: Guaranteed by the caller to be valid to dereference.
+        let runtime = &mut *runtime;
 
         eprintln!("{}", self.msg);
         while !runtime.update() {

crates/mun_runtime_capi/src/runtime.rs

@@ -421,7 +421,7 @@ mod tests {
         let lib_path = CString::new("some/path").expect("Invalid library path");
 
         let type_id = <()>::type_info().clone().into();
-        let functions = vec![ExternalFunctionDefinition {
+        let functions = [ExternalFunctionDefinition {
             name: ptr::null(),
             arg_types: ptr::null(),
             return_type: type_id,
@@ -447,7 +447,7 @@ mod tests {
 
         let invalid_encoding = ['�', '\0'];
         let type_id = <()>::type_info().clone().into();
-        let functions = vec![ExternalFunctionDefinition {
+        let functions = [ExternalFunctionDefinition {
             name: invalid_encoding.as_ptr().cast(),
             arg_types: ptr::null(),
             return_type: type_id,
@@ -472,7 +472,7 @@ mod tests {
         let lib_path = CString::new("some/path").expect("Invalid library path");
         let function_name = CString::new("foobar").unwrap();
 
-        let functions = vec![ExternalFunctionDefinition {
+        let functions = [ExternalFunctionDefinition {
             name: function_name.as_ptr(),
             arg_types: ptr::null(),
             return_type: Type::null(),
@@ -498,7 +498,7 @@ mod tests {
         let function_name = CString::new("foobar").unwrap();
 
         let type_id = <()>::type_info().clone().into();
-        let functions = vec![ExternalFunctionDefinition {
+        let functions = [ExternalFunctionDefinition {
             name: function_name.as_ptr(),
             arg_types: ptr::null(),
             return_type: type_id,
@@ -525,7 +525,7 @@ mod tests {
         let arg_types = [Type::null()];
 
         let type_id = <()>::type_info().clone().into();
-        let functions = vec![ExternalFunctionDefinition {
+        let functions = [ExternalFunctionDefinition {
             name: function_name.as_ptr(),
             arg_types: &arg_types as _,
             return_type: type_id,

crates/mun_syntax/src/syntax_node.rs

@@ -35,7 +35,7 @@ pub type SyntaxElement = rowan::NodeOrToken<SyntaxNode, SyntaxToken>;
 pub type SyntaxNodeChildren = rowan::SyntaxNodeChildren<MunLanguage>;
 pub type SyntaxElementChildren = rowan::SyntaxElementChildren<MunLanguage>;
 
-pub use rowan::{Direction, NodeOrToken};
+pub use rowan::Direction;
 
 pub struct SyntaxTreeBuilder {
     errors: Vec<SyntaxError>,