Clean up code a bit:

 * Remove "bool_to_options" feature
 * Update version for compiler feature
 * rustfmt

diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs
index fd6e631c2b57793c621e01e8ebd8cfa4a835f517..ec2c703ad495d28e6e9c5bccfaa8bb399ae8e94c 100644 (file)
--- a/compiler/rustc_feature/src/active.rs
+++ b/compiler/rustc_feature/src/active.rs
@@ -676,7 +676,7 @@ pub fn set(&self, features: &mut Features, span: Span) {
     (active, closure_track_caller, "1.57.0", Some(87417), None),
 
     /// Allows `#[doc(cfg_hide(...))]`.
-    (active, doc_cfg_hide, "1.53.0", Some(43781), None),
+    (active, doc_cfg_hide, "1.57.0", Some(43781), None),
 
     // -------------------------------------------------------------------------
     // feature-group-end: actual feature gates

diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs
index a9704bed2df67ece52b8507808f0b1ebc61a9d50..72fe84222deaca860e457eb8e56990397a96dcac 100644 (file)
--- a/library/alloc/src/lib.rs
+++ b/library/alloc/src/lib.rs
@@ -65,9 +65,10 @@
 #![doc(
     html_playground_url = "https://play.rust-lang.org/",
     issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
-    test(no_crate_inject, attr(allow(unused_variables), deny(warnings))),
+    test(no_crate_inject, attr(allow(unused_variables), deny(warnings)))
 )]
-#![cfg_attr(not(bootstrap),
+#![cfg_attr(
+    not(bootstrap),
     doc(cfg_hide(not(test), not(any(test, bootstrap)), target_has_atomic = "ptr"))
 )]
 #![no_std]

diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
index f4670d8feb233090110d08bfaa78161ab9054b50..630cf31634ac91e9f84a13e1ec519047cab0497c 100644 (file)
--- a/library/core/src/lib.rs
+++ b/library/core/src/lib.rs
@@ -58,9 +58,10 @@
     html_playground_url = "https://play.rust-lang.org/",
     issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
     test(no_crate_inject, attr(deny(warnings))),
-    test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))),
+    test(attr(allow(dead_code, deprecated, unused_variables, unused_mut)))
 )]
-#![cfg_attr(not(bootstrap),
+#![cfg_attr(
+    not(bootstrap),
     doc(cfg_hide(
         not(test),
         target_pointer_width = "16",

diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index af48e5e9bd297041ce0f59ac12d3c46a8e95c7b0..e074609773a7be1083159daadec1760acb08f95e 100644 (file)
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -193,11 +193,9 @@
     html_playground_url = "https://play.rust-lang.org/",
     issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
     test(no_crate_inject, attr(deny(warnings))),
-    test(attr(allow(dead_code, deprecated, unused_variables, unused_mut))),
-)]
-#![cfg_attr(not(bootstrap),
-    doc(cfg_hide(not(test), not(any(test, bootstrap))))
+    test(attr(allow(dead_code, deprecated, unused_variables, unused_mut)))
 )]
+#![cfg_attr(not(bootstrap), doc(cfg_hide(not(test), not(any(test, bootstrap)))))]
 // Don't link to std. We are std.
 #![no_std]
 #![warn(deprecated_in_future)]

diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index ebbf280d96d29700be68840ef2c3201fd92474da..09cb99dbf223df922ed140767e5ee9079effab2d 100644 (file)
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -786,7 +786,9 @@ impl<T: IntoIterator> SingleExt for T {
             fn single(self) -> Option<Self::Item> {
                 let mut iter = self.into_iter();
                 let item = iter.next()?;
-                iter.next().is_none().then_some(())?;
+                if iter.next().is_some() {
+                    return None;
+                }
                 Some(item)
             }
         }
@@ -802,16 +804,19 @@ fn single(self) -> Option<Self::Item> {
             if doc_cfg.peek().is_some() {
                 doc_cfg
                     .filter_map(|attr| {
-                        Cfg::parse(&attr).map_err(|e| sess.diagnostic().span_err(e.span, e.msg)).ok()
+                        Cfg::parse(&attr)
+                            .map_err(|e| sess.diagnostic().span_err(e.span, e.msg))
+                            .ok()
                     })
                     .fold(Cfg::True, |cfg, new_cfg| cfg & new_cfg)
             } else {
-                self
-                    .iter()
+                self.iter()
                     .filter(|attr| attr.has_name(sym::cfg))
                     .filter_map(|attr| Some(attr.meta_item_list()?.single()?.meta_item()?.clone()))
                     .filter_map(|attr| {
-                        Cfg::parse(&attr).map_err(|e| sess.diagnostic().span_err(e.span, e.msg)).ok()
+                        Cfg::parse(&attr)
+                            .map_err(|e| sess.diagnostic().span_err(e.span, e.msg))
+                            .ok()
                     })
                     .filter(|cfg| !hidden_cfg.contains(cfg))
                     .fold(Cfg::True, |cfg, new_cfg| cfg & new_cfg)

diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index d070ce22890d2f0f5c4a381a17142e0ea8ee8dbf..efc8e31498a9c9c50d09fa75ddf1eb049e03f876 100644 (file)
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -5,7 +5,6 @@
 #![feature(rustc_private)]
 #![feature(array_methods)]
 #![feature(assert_matches)]
-#![feature(bool_to_option)]
 #![feature(box_patterns)]
 #![feature(control_flow_enum)]
 #![feature(box_syntax)]

diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index cd657fa01d45332d81e66cd6805aa482cffc4299..36b1a14f6c1ea488f0d26af3316584a9373ff7e2 100644 (file)
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -3,10 +3,10 @@
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
-use rustc_hir::CRATE_HIR_ID;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::Node;
+use rustc_hir::CRATE_HIR_ID;
 use rustc_middle::middle::privacy::AccessLevel;
 use rustc_middle::ty::TyCtxt;
 use rustc_span;
@@ -99,7 +99,11 @@ fn store_path(&mut self, did: DefId) {
             }
         }
 
-        self.cx.cache.hidden_cfg = self.cx.tcx.hir().attrs(CRATE_HIR_ID)
+        self.cx.cache.hidden_cfg = self
+            .cx
+            .tcx
+            .hir()
+            .attrs(CRATE_HIR_ID)
             .iter()
             .filter(|attr| attr.has_name(sym::doc))
             .flat_map(|attr| attr.meta_item_list().into_iter().flatten())