diff options
| author | bors <bors@rust-lang.org> | 2019-02-25 03:48:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-25 03:48:12 +0000 |
| commit | c1911babed0364ede7dedc646dbca63fac03d5c5 (patch) | |
| tree | a7f6a7d6a44bcafa523052938587718261c4da15 /src/bootstrap/bin | |
| parent | eb1df8c8a7b368c31c3bf58074327c7ae7f54710 (diff) | |
| parent | 6806d0cf692edf9aa308cc841c81afbfc83c03bf (diff) | |
| download | rust-c1911babed0364ede7dedc646dbca63fac03d5c5.tar.gz rust-c1911babed0364ede7dedc646dbca63fac03d5c5.zip | |
Auto merge of #58714 - Centril:rollup, r=Centril
Rollup of 5 pull requests Successful merges: - #58370 (Relax some Hash bounds on HashMap<K, V, S> and HashSet<T, S>) - #58421 (Relax some Ord bounds on BinaryHeap<T>) - #58686 (replace deprecated rustfmt_skip with rustfmt::skip) - #58697 (Use ? in some macros) - #58704 (Remove some unnecessary 'extern crate') Failed merges: r? @ghost
Diffstat (limited to 'src/bootstrap/bin')
| -rw-r--r-- | src/bootstrap/bin/main.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/bin/rustc.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/bin/rustdoc.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/bin/sccache-plus-cl.rs | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/src/bootstrap/bin/main.rs b/src/bootstrap/bin/main.rs index 8ddce5c247d..0732cb83f39 100644 --- a/src/bootstrap/bin/main.rs +++ b/src/bootstrap/bin/main.rs @@ -7,8 +7,6 @@ #![deny(warnings)] -extern crate bootstrap; - use std::env; use bootstrap::{Config, Build}; diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs index 7a765973e20..b6afe317a07 100644 --- a/src/bootstrap/bin/rustc.rs +++ b/src/bootstrap/bin/rustc.rs @@ -17,8 +17,6 @@ #![deny(warnings)] -extern crate bootstrap; - use std::env; use std::ffi::OsString; use std::io; diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs index aeb15821b0b..36beec3a944 100644 --- a/src/bootstrap/bin/rustdoc.rs +++ b/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; diff --git a/src/bootstrap/bin/sccache-plus-cl.rs b/src/bootstrap/bin/sccache-plus-cl.rs index f9e14d1ff6d..f40eec83ddf 100644 --- a/src/bootstrap/bin/sccache-plus-cl.rs +++ b/src/bootstrap/bin/sccache-plus-cl.rs @@ -1,5 +1,3 @@ -extern crate cc; - use std::env; use std::process::{self, Command}; |
