Rollup merge of #53214 - memoryruins:nll_bootstrap_2, r=nikomatsakis

[rust.git] / src / librustc_save_analysis / lib.rs

diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
index 3fada8d4aa88087fc434b8a1e84857bdf52f4757..50aa48e8c5249801eee25eeb1613ea76e058db45 100644 (file)
--- a/src/librustc_save_analysis/lib.rs
+++ b/src/librustc_save_analysis/lib.rs
@@ -12,6 +12,7 @@
        html_favicon_url = "https://doc.rust-lang.org/favicon.ico",
        html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(custom_attribute)]
+#![cfg_attr(not(stage0), feature(nll))]
 #![allow(unused_attributes)]
 
 #![recursion_limit="256"]
@@ -125,7 +126,7 @@ pub fn get_external_crates(&self) -> Vec<ExternalCrateData> {
             result.push(ExternalCrateData {
                 // FIXME: change file_name field to PathBuf in rls-data
                 // https://github.com/nrc/rls-data/issues/7
-                file_name: SpanUtils::make_path_string(&lo_loc.file.name),
+                file_name: self.span_utils.make_path_string(&lo_loc.file.name),
                 num: n.as_u32(),
                 id: GlobalCrateId {
                     name: self.tcx.crate_name(n).to_string(),
@@ -811,7 +812,7 @@ fn fn_type(path: &ast::Path) -> bool {
             HirDef::Label(..) |
             HirDef::Macro(..) |
             HirDef::ToolMod |
-            HirDef::NonMacroAttr |
+            HirDef::NonMacroAttr(..) |
             HirDef::Err => None,
         }
     }