Auto merge of #68192 - GuillaumeGomez:remove-inlined-types, r=kinnison

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

diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index aaaff7e3b0a4a9eef42da430219e455ecdbebeeb..cf925ab91875f0fcf0e572ecbd22599d742f24aa 100644 (file)
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -1,5 +1,4 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-
 #![feature(bool_to_option)]
 #![feature(box_patterns)]
 #![feature(core_intrinsics)]
@@ -11,11 +10,10 @@
 #![feature(proc_macro_internals)]
 #![feature(proc_macro_quote)]
 #![feature(rustc_private)]
-#![feature(slice_patterns)]
+#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(specialization)]
 #![feature(stmt_expr_attributes)]
-
-#![recursion_limit="256"]
+#![recursion_limit = "256"]
 
 extern crate libc;
 extern crate proc_macro;
@@ -40,7 +38,7 @@
 pub fn validate_crate_name(
     sess: Option<&rustc::session::Session>,
     s: &str,
-    sp: Option<syntax_pos::Span>
+    sp: Option<rustc_span::Span>,
 ) {
     let mut err_count = 0;
     {
@@ -56,8 +54,12 @@ pub fn validate_crate_name(
             say("crate name must not be empty");
         }
         for c in s.chars() {
-            if c.is_alphanumeric() { continue }
-            if c == '_'  { continue }
+            if c.is_alphanumeric() {
+                continue;
+            }
+            if c == '_' {
+                continue;
+            }
             say(&format!("invalid character `{}` in crate name: `{}`", c, s));
         }
     }