Auto merge of #67596 - Mark-Simulacrum:tidy-silence-rustfmt, r=Centril

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

diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index e708c5ab6e77d0da21e6e75270a1c4dda3d19bec..55713aedbcb67589677696ef39d1f2f6004c98b6 100644 (file)
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -27,8 +27,8 @@
 //! This API is completely unstable and subject to change.
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-
 #![feature(arbitrary_self_types)]
+#![feature(bool_to_option)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(const_fn)]
@@ -36,7 +36,7 @@
 #![feature(core_intrinsics)]
 #![feature(drain_filter)]
 #![cfg_attr(windows, feature(libc))]
-#![cfg_attr(bootstrap, feature(never_type))]
+#![feature(never_type)]
 #![feature(exhaustive_patterns)]
 #![feature(overlapping_marker_traits)]
 #![feature(extern_types)]
@@ -60,18 +60,24 @@
 #![feature(associated_type_bounds)]
 #![feature(rustc_attrs)]
 #![feature(hash_raw_entry)]
+#![recursion_limit = "512"]
 
-#![recursion_limit="512"]
-
-#[macro_use] extern crate bitflags;
-#[macro_use] extern crate scoped_tls;
+#[macro_use]
+extern crate bitflags;
+#[macro_use]
+extern crate scoped_tls;
 #[cfg(windows)]
 extern crate libc;
-#[macro_use] extern crate rustc_macros;
-#[macro_use] extern crate rustc_data_structures;
-#[macro_use] extern crate log;
-#[macro_use] extern crate syntax;
-#[macro_use] extern crate smallvec;
+#[macro_use]
+extern crate rustc_macros;
+#[macro_use]
+extern crate rustc_data_structures;
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate syntax;
+#[macro_use]
+extern crate smallvec;
 
 #[cfg(test)]
 mod tests;
@@ -96,12 +102,12 @@ pub mod middle {
     pub mod diagnostic_items;
     pub mod exported_symbols;
     pub mod free_region;
-    pub mod lib_features;
     pub mod lang_items;
+    pub mod lib_features;
     pub mod privacy;
     pub mod reachable;
-    pub mod region;
     pub mod recursion_limit;
+    pub mod region;
     pub mod resolve_lifetime;
     pub mod stability;
     pub mod weak_lang_items;
@@ -113,10 +119,10 @@ pub mod middle {
 pub mod ty;
 
 pub mod util {
+    pub mod bug;
     pub mod captures;
     pub mod common;
     pub mod nodemap;
-    pub mod bug;
 }
 
 // Allows macros to refer to this crate as `::rustc`