clippy (#1110)

Co-authored-by: Grant  Wuerker <grantwuerker@pop-os.localdomain>

Author: g-r-a-n-t

crates/common/src/core.rs

@@ -15,7 +15,7 @@ pub struct Core;
 
 pub trait HasBuiltinCore: InputDb {
     fn initialize_builtin_core(&mut self);
-    fn builtin_core(&self) -> Ingot;
+    fn builtin_core(&self) -> Ingot<'_>;
 }
 
 impl<T: InputDb> HasBuiltinCore for T {
@@ -33,7 +33,7 @@ impl<T: InputDb> HasBuiltinCore for T {
         }
     }
 
-    fn builtin_core(&self) -> Ingot {
+    fn builtin_core(&self) -> Ingot<'_> {
         let core = self
             .workspace()
             .containing_ingot(self, Url::parse(BUILTIN_CORE_BASE_URL).unwrap());

crates/common/src/urlext.rs

@@ -46,7 +46,7 @@ impl UrlExt for Url {
             // If we're not already at a directory, return the directory
             Some(directory)
         } else if self.path() == "/" {
-            return None;
+            None
         } else {
             // We're already at a directory, go up one level
             let mut parent = self.clone();
@@ -55,7 +55,7 @@ impl UrlExt for Url {
                 segments.pop();
                 segments.push(""); // Ensure trailing slash
             }
-            return Some(parent);
+            Some(parent)
         }
     }
 

crates/driver/src/db.rs

@@ -51,7 +51,7 @@ impl DriverDataBase {
         DiagnosticsCollection(pass_manager.run_on_module_tree(self, tree))
     }
 
-    pub fn top_mod(&self, input: File) -> TopLevelMod {
+    pub fn top_mod(&self, input: File) -> TopLevelMod<'_> {
         map_file_to_mod(self, input)
     }
 }

crates/hir-analysis/src/name_resolution/name_resolver.rs

@@ -281,7 +281,7 @@ impl<'db> NameRes<'db> {
         }
     }
 
-    pub fn enum_variant(&self) -> Option<EnumVariant> {
+    pub fn enum_variant(&self) -> Option<EnumVariant<'_>> {
         match self.kind {
             NameResKind::Scope(ScopeId::Variant(v)) => Some(v),
             _ => None,

crates/hir-analysis/src/ty/decision_tree.rs

@@ -309,7 +309,7 @@ impl<'db> SimplifiedArm<'db> {
         }
     }
 
-    fn pat(&self, col: usize) -> &SimplifiedPattern {
+    fn pat(&self, col: usize) -> &SimplifiedPattern<'_> {
         &self.pat_vec.inner[col]
     }
 
@@ -371,11 +371,11 @@ impl<'db> SimplifiedArmMatrix<'db> {
         self.arms[0].pat_vec.len()
     }
 
-    fn pat(&self, row: usize, col: usize) -> &SimplifiedPattern {
+    fn pat(&self, row: usize, col: usize) -> &SimplifiedPattern<'_> {
         self.arms[row].pat(col)
     }
 
-    fn reduced_pat_mat(&self, col: usize) -> PatternMatrix {
+    fn reduced_pat_mat(&self, col: usize) -> PatternMatrix<'_> {
         let mut rows = Vec::with_capacity(self.nrows());
         for arm in self.arms.iter() {
             let reduced_pat_vec = arm

crates/hir-analysis/src/ty/trait_def.rs

@@ -169,7 +169,7 @@ impl<'db> TraitEnv<'db> {
     }
 
     /// Returns the corresponding implementor of the given `impl Trait` type.
-    pub(crate) fn map_impl_trait(&self, trait_ref: ImplTrait) -> Option<Binder<Implementor>> {
+    pub(crate) fn map_impl_trait(&self, trait_ref: ImplTrait) -> Option<Binder<Implementor<'_>>> {
         self.hir_to_implementor.get(&trait_ref).copied()
     }
 }

crates/hir-analysis/src/ty/ty_check/expr.rs

@@ -1281,7 +1281,7 @@ impl TraitOps for AugAssignOp {
     }
 }
 
-fn std_ops_path(db: &dyn HirAnalysisDb) -> PathId {
+fn std_ops_path(db: &dyn HirAnalysisDb) -> PathId<'_> {
     let std_ = IdentId::new(db, "std".to_string());
     let ops_ = IdentId::new(db, "ops".to_string());
     PathId::from_ident(db, std_).push_ident(db, ops_)

crates/hir-analysis/tests/test_db.rs

@@ -56,7 +56,7 @@ impl HirAnalysisTestDb {
         )
     }
 
-    pub fn top_mod(&self, input: File) -> (TopLevelMod, HirPropertyFormatter) {
+    pub fn top_mod(&self, input: File) -> (TopLevelMod<'_>, HirPropertyFormatter<'_>) {
         let mut prop_formatter = HirPropertyFormatter::default();
         let top_mod = self.register_file(&mut prop_formatter, input);
         (top_mod, prop_formatter)

crates/hir/src/hir_def/module_tree.rs

@@ -95,7 +95,7 @@ where
 
 impl ModuleTree<'_> {
     /// Returns the tree node data of the given id.
-    pub fn node_data(&self, id: ModuleTreeNodeId) -> &ModuleTreeNode {
+    pub fn node_data(&self, id: ModuleTreeNodeId) -> &ModuleTreeNode<'_> {
         &self.module_tree.0[id]
     }
 
@@ -105,7 +105,7 @@ impl ModuleTree<'_> {
     }
 
     /// Returns the tree node data of the given top level module.
-    pub fn tree_node_data(&self, top_mod: TopLevelMod) -> &ModuleTreeNode {
+    pub fn tree_node_data(&self, top_mod: TopLevelMod) -> &ModuleTreeNode<'_> {
         &self.module_tree.0[self.tree_node(top_mod)]
     }
 
@@ -114,21 +114,21 @@ impl ModuleTree<'_> {
         self.root
     }
 
-    pub fn root_data(&self) -> &ModuleTreeNode {
+    pub fn root_data(&self) -> &ModuleTreeNode<'_> {
         self.node_data(self.root)
     }
 
     /// Returns an iterator of all top level modules in this ingot.
-    pub fn all_modules(&self) -> impl Iterator<Item = TopLevelMod> + '_ {
+    pub fn all_modules(&self) -> impl Iterator<Item = TopLevelMod<'_>> + '_ {
         self.mod_map.keys().copied()
     }
 
-    pub fn parent(&self, top_mod: TopLevelMod) -> Option<TopLevelMod> {
+    pub fn parent(&self, top_mod: TopLevelMod) -> Option<TopLevelMod<'_>> {
         let node = self.tree_node_data(top_mod);
         node.parent.map(|id| self.module_tree.0[id].top_mod)
     }
 
-    pub fn children(&self, top_mod: TopLevelMod) -> impl Iterator<Item = TopLevelMod> + '_ {
+    pub fn children(&self, top_mod: TopLevelMod) -> impl Iterator<Item = TopLevelMod<'_>> + '_ {
         self.tree_node_data(top_mod)
             .children
             .iter()

crates/hir/src/hir_def/prim_ty.rs

@@ -12,7 +12,7 @@ pub enum PrimTy {
 }
 
 impl PrimTy {
-    pub fn name(self, db: &dyn HirDb) -> IdentId {
+    pub fn name(self, db: &dyn HirDb) -> IdentId<'_> {
         match self {
             PrimTy::Bool => IdentId::make_bool(db),
             PrimTy::Int(ty) => ty.name(db),
@@ -55,7 +55,7 @@ pub enum IntTy {
 }
 
 impl IntTy {
-    pub fn name(self, db: &dyn HirDb) -> IdentId {
+    pub fn name(self, db: &dyn HirDb) -> IdentId<'_> {
         match self {
             IntTy::I8 => IdentId::make_i8(db),
             IntTy::I16 => IdentId::make_i16(db),
@@ -80,7 +80,7 @@ pub enum UintTy {
 }
 
 impl UintTy {
-    pub fn name(self, db: &dyn HirDb) -> IdentId {
+    pub fn name(self, db: &dyn HirDb) -> IdentId<'_> {
         match self {
             UintTy::U8 => IdentId::make_u8(db),
             UintTy::U16 => IdentId::make_u16(db),