diff options
| author | bors <bors@rust-lang.org> | 2019-02-09 01:04:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-09 01:04:13 +0000 |
| commit | cb6fafbdf3b09da28b09fa7e87a24658d77dd02f (patch) | |
| tree | 34623c614c288fc44a9d0b0b6299e8c5652c83e6 /src/librustc_codegen_utils/lib.rs | |
| parent | a2ec156a5b5d58f2a73bf21b1fe037b6ac1cf5cc (diff) | |
| parent | 068a9266222ff695e48e4ebeaf7add7ee0367f1d (diff) | |
| download | rust-cb6fafbdf3b09da28b09fa7e87a24658d77dd02f.tar.gz rust-cb6fafbdf3b09da28b09fa7e87a24658d77dd02f.zip | |
Auto merge of #58316 - Centril:rollup, r=Centril
Rollup of 18 pull requests Successful merges: - #58091 (Transition compiletest to Rust 2018) - #58115 (Transition rustdoc to 2018 edition) - #58120 (Transition build_helper to 2018 edition) - #58222 (librustc_allocator => 2018) - #58233 (librustc_save_analysis => 2018) - #58245 (librustc_lint => 2018) - #58247 (librustc_passes => 2018) - #58251 (Transition librustc_traits to 2018 edition) - #58255 (librustc_metadata => 2018) - #58256 (librustc_cratesio_shim => 2018) - #58257 (librustc_target => 2018) - #58259 (librustc_codegen_utils => 2018) - #58260 (librustc_borrowck => 2018) - #58261 (librustc_incremental => 2018) - #58265 (librustc_mir => 2018) - #58275 (libcore, liballoc: disable tests in Miri) - #58285 (error_index_generator => 2018) - #58312 (librustc_data_structures => 2018) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils/lib.rs')
| -rw-r--r-- | src/librustc_codegen_utils/lib.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs index d6ef555144d..2b70141894b 100644 --- a/src/librustc_codegen_utils/lib.rs +++ b/src/librustc_codegen_utils/lib.rs @@ -14,18 +14,10 @@ #![recursion_limit="256"] -extern crate flate2; -#[macro_use] -extern crate log; +#![deny(rust_2018_idioms)] #[macro_use] extern crate rustc; -extern crate rustc_target; -extern crate rustc_metadata; -extern crate rustc_mir; -extern crate rustc_incremental; -extern crate syntax; -extern crate syntax_pos; #[macro_use] extern crate rustc_data_structures; use rustc::ty::TyCtxt; @@ -40,7 +32,7 @@ pub mod symbol_names_test; /// error in codegen. This is used to write compile-fail tests /// that actually test that compilation succeeds without /// reporting an error. -pub fn check_for_rustc_errors_attr(tcx: TyCtxt) { +pub fn check_for_rustc_errors_attr(tcx: TyCtxt<'_, '_, '_>) { if let Some((def_id, _)) = tcx.entry_fn(LOCAL_CRATE) { if tcx.has_attr(def_id, "rustc_error") { tcx.sess.span_fatal(tcx.def_span(def_id), "compilation successful"); |