Auto merge of rust-lang#58714 - Centril:rollup, r=Centril

Rollup of 5 pull requests

Successful merges:

 - rust-lang#58370 (Relax some Hash bounds on HashMap<K, V, S> and HashSet<T, S>)
 - rust-lang#58421 (Relax some Ord bounds on BinaryHeap<T>)
 - rust-lang#58686 (replace deprecated rustfmt_skip with rustfmt::skip)
 - rust-lang#58697 (Use ? in some macros)
 - rust-lang#58704 (Remove some unnecessary 'extern crate')

Failed merges:

r? @ghost

src/bootstrap/bin/main.rs

@@ -7,8 +7,6 @@
 
 #![deny(warnings)]
 
-extern crate bootstrap;
-
 use std::env;
 
 use bootstrap::{Config, Build};

src/bootstrap/bin/rustc.rs

@@ -17,8 +17,6 @@
 
 #![deny(warnings)]
 
-extern crate bootstrap;
-
 use std::env;
 use std::ffi::OsString;
 use std::io;

src/bootstrap/bin/rustdoc.rs

@@ -4,8 +4,6 @@
 
 #![deny(warnings)]
 
-extern crate bootstrap;
-
 use std::env;
 use std::process::Command;
 use std::path::PathBuf;

src/bootstrap/bin/sccache-plus-cl.rs

@@ -1,5 +1,3 @@
-extern crate cc;
-
 use std::env;
 use std::process::{self, Command};
 

src/bootstrap/builder.rs

@@ -326,7 +326,7 @@ pub enum Kind {
 impl<'a> Builder<'a> {
     fn get_step_descriptions(kind: Kind) -> Vec<StepDescription> {
         macro_rules! describe {
-            ($($rule:ty),+ $(,)*) => {{
+            ($($rule:ty),+ $(,)?) => {{
                 vec![$(StepDescription::from::<$rule>()),+]
             }};
         }

src/bootstrap/lib.rs

@@ -114,23 +114,11 @@ extern crate build_helper;
 extern crate serde_derive;
 #[macro_use]
 extern crate lazy_static;
-extern crate serde_json;
-extern crate cmake;
-extern crate filetime;
-extern crate cc;
-extern crate getopts;
-extern crate num_cpus;
-extern crate toml;
-extern crate time;
-extern crate petgraph;
 
 #[cfg(test)]
 #[macro_use]
 extern crate pretty_assertions;
 
-#[cfg(unix)]
-extern crate libc;
-
 use std::cell::{RefCell, Cell};
 use std::collections::{HashSet, HashMap};
 use std::env;

src/liballoc/benches/lib.rs

@@ -1,8 +1,6 @@
 #![feature(repr_simd)]
 #![feature(test)]
 
-extern crate rand;
-extern crate rand_xorshift;
 extern crate test;
 
 mod btree;

src/liballoc/boxed.rs

@@ -326,7 +326,7 @@ impl<T: Clone> Clone for Box<T> {
     /// let x = Box::new(5);
     /// let y = x.clone();
     /// ```
-    #[rustfmt_skip]
+    #[rustfmt::skip]
     #[inline]
     fn clone(&self) -> Box<T> {
         box { (**self).clone() }