]> git.lizzy.rs Git - rust.git/commitdiff
Simplify
authorAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 8 Nov 2019 20:53:39 +0000 (23:53 +0300)
committerAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 8 Nov 2019 20:53:39 +0000 (23:53 +0300)
There's only one call-site for the function, so it seems fine to
inline

crates/ra_hir_def/src/nameres.rs
crates/ra_hir_def/src/nameres/collector.rs

index e1959cdb9e97b193d7d93c7c00578d00cc45dd05..fb3ba53059abc9c8d6c08a9cd5dfd223bd8e47d3 100644 (file)
@@ -195,12 +195,6 @@ pub struct Resolution {
     pub import: Option<ImportId>,
 }
 
-impl Resolution {
-    fn from_macro(macro_: MacroDefId) -> Self {
-        Resolution { def: PerNs::macros(macro_), import: None }
-    }
-}
-
 #[derive(Debug, Clone)]
 struct ResolvePathResult {
     resolved_def: PerNs,
index 3b61d9895bc3024817d9e1f87a1c964915ca570c..9ab378d54da15ffc2cb5f3822f250282407f59d3 100644 (file)
@@ -182,7 +182,11 @@ fn define_macro(
         // In Rust, `#[macro_export]` macros are unconditionally visible at the
         // crate root, even if the parent modules is **not** visible.
         if export {
-            self.update(self.def_map.root, None, &[(name, Resolution::from_macro(macro_))]);
+            self.update(
+                self.def_map.root,
+                None,
+                &[(name, Resolution { def: PerNs::macros(macro_), import: None })],
+            );
         }
     }