fix clippy

metaborg · Oct 23, 2024 · 11d58ab · 11d58ab
1 parent ff97ea7
commit 11d58ab
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 17 deletions.
diff --git a/scopegraphs/src/completeness/explicit.rs b/scopegraphs/src/completeness/explicit.rs
@@ -68,9 +68,12 @@ impl<LABEL: Hash + Eq + Label, DATA> Completeness<LABEL, DATA> for ExplicitClose
         }
     }
 
-    type GetEdgesResult<'rslv> = EdgesOrDelay<Vec<Scope>, LABEL>
-        where
-            Self: 'rslv, LABEL: 'rslv, DATA: 'rslv;
+    type GetEdgesResult<'rslv>
+        = EdgesOrDelay<Vec<Scope>, LABEL>
+    where
+        Self: 'rslv,
+        LABEL: 'rslv,
+        DATA: 'rslv;
 
     fn cmpl_get_edges<'rslv>(
         &self,

diff --git a/scopegraphs/src/completeness/future.rs b/scopegraphs/src/completeness/future.rs
@@ -63,7 +63,12 @@ impl<LABEL: Hash + Eq + Label + Copy, DATA> Completeness<LABEL, DATA>
             .cmpl_new_edge(inner_scope_graph, src, lbl, dst)
     }
 
-    type GetEdgesResult<'rslv> = FutureWrapper<'rslv, Vec<Scope>> where Self: 'rslv, LABEL: 'rslv, DATA: 'rslv;
+    type GetEdgesResult<'rslv>
+        = FutureWrapper<'rslv, Vec<Scope>>
+    where
+        Self: 'rslv,
+        LABEL: 'rslv,
+        DATA: 'rslv;
 
     fn cmpl_get_edges<'rslv>(
         &'rslv self,

diff --git a/scopegraphs/src/completeness/implicit.rs b/scopegraphs/src/completeness/implicit.rs
@@ -67,9 +67,12 @@ impl<LABEL: Hash + Eq + Label, DATA> Completeness<LABEL, DATA> for ImplicitClose
         }
     }
 
-    type GetEdgesResult<'rslv> = Vec<Scope>
-        where
-            Self: 'rslv, LABEL: 'rslv, DATA: 'rslv;
+    type GetEdgesResult<'rslv>
+        = Vec<Scope>
+    where
+        Self: 'rslv,
+        LABEL: 'rslv,
+        DATA: 'rslv;
 
     fn cmpl_get_edges<'rslv>(
         &self,

diff --git a/scopegraphs/src/completeness/unchecked.rs b/scopegraphs/src/completeness/unchecked.rs
@@ -46,9 +46,12 @@ impl<LABEL: Hash + Eq, DATA> Completeness<LABEL, DATA> for UncheckedCompleteness
         inner_scope_graph.add_edge(src, lbl, dst)
     }
 
-    type GetEdgesResult<'rslv> = Vec<Scope>
-        where
-            Self: 'rslv, LABEL: 'rslv, DATA: 'rslv;
+    type GetEdgesResult<'rslv>
+        = Vec<Scope>
+    where
+        Self: 'rslv,
+        LABEL: 'rslv,
+        DATA: 'rslv;
 
     fn cmpl_get_edges<'rslv>(
         &self,

diff --git a/scopegraphs/src/render/mod.rs b/scopegraphs/src/render/mod.rs
@@ -118,7 +118,8 @@ pub trait RenderScopeData {
         self.render_node().is_some()
     }
 
-    fn explicit_relabel(&self, scope_id: usize) -> Option<String> {
+    /// Allows you to relabel specific scope IDs, can be useful for documentation purposes.
+    fn explicit_relabel(&self, _scope_id: usize) -> Option<String> {
         None
     }
 }

diff --git a/scopegraphs/src/resolve/lookup.rs b/scopegraphs/src/resolve/lookup.rs
@@ -44,7 +44,11 @@ where
     ResolvedPath<'sg, LABEL, DATA>: Hash + Eq,
     Path<LABEL>: Clone,
 {
-    type EnvContainer = EnvC<'sg, 'rslv, CMPL, LABEL, DATA> where 'sg: 'rslv, Self: 'rslv;
+    type EnvContainer
+        = EnvC<'sg, 'rslv, CMPL, LABEL, DATA>
+    where
+        'sg: 'rslv,
+        Self: 'rslv;
 
     /// Entry point of lookup-based query resolution. Performs a traversal of the scope graph that
     /// results in an environment containing all declarations matching a reference.

diff --git a/scopegraphs/src/resolve/mod.rs b/scopegraphs/src/resolve/mod.rs
@@ -639,12 +639,12 @@ impl<'sg, 'storage, 'rslv, LABEL, DATA, CMPL, PWF, DWF, LO, DEq>
 
 impl<'storage, LABEL, DATA, CMPL> ScopeGraph<'storage, LABEL, DATA, CMPL> {
     /// Build a query over the scope graph.
-    pub fn query<'sg>(
-        &'sg self,
+    pub fn query<'rslv>(
+        &'rslv self,
     ) -> Query<
         'storage,
-        'sg,
-        '_,
+        'rslv,
+        'rslv,
         LABEL,
         DATA,
         CMPL,
@@ -654,7 +654,7 @@ impl<'storage, LABEL, DATA, CMPL> ScopeGraph<'storage, LABEL, DATA, CMPL> {
         DefaultDataEquivalence,
     >
     where
-        'storage: 'sg,
+        'storage: 'rslv,
     {
         Query {
             _phantom: PhantomData,