diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-07 20:01:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-07 20:01:44 +0200 |
| commit | 89a69fd76d275ddd2c81fdbae02a966d24658aaa (patch) | |
| tree | b191b0475521f0d20bf4aaad612c28a4d9a8d952 /src/librustc_codegen_llvm | |
| parent | 3c4a58622128887778c6fd7c35de66f3fa463708 (diff) | |
| parent | 5153db136e8419beb217340500a97db553ddabbe (diff) | |
| download | rust-89a69fd76d275ddd2c81fdbae02a966d24658aaa.tar.gz rust-89a69fd76d275ddd2c81fdbae02a966d24658aaa.zip | |
Rollup merge of #64139 - Mark-Simulacrum:strip-legacy-proc-macro, r=petrochenkov
Migrate internal diagnostic registration to macro_rules Review is best done commit-by-commit. Fixes #64132.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/Cargo.toml | 4 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/error_codes.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/lib.rs | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 5e1b0eafdec..98efa6a5804 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -11,11 +11,7 @@ crate-type = ["dylib"] test = false [dependencies] -cc = "1.0.1" # Used to locate MSVC -num_cpus = "1.0" -tempfile = "3.0" rustc_llvm = { path = "../librustc_llvm" } -memmap = "0.6" [features] # This is used to convince Cargo to separately cache builds of `rustc_codegen_llvm` diff --git a/src/librustc_codegen_llvm/error_codes.rs b/src/librustc_codegen_llvm/error_codes.rs index c6b5dc03a6f..042e51ed2ba 100644 --- a/src/librustc_codegen_llvm/error_codes.rs +++ b/src/librustc_codegen_llvm/error_codes.rs @@ -1,4 +1,4 @@ -register_long_diagnostics! { +register_diagnostics! { E0511: r##" Invalid monomorphization of an intrinsic function was used. Erroneous code diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 2fd78885bd0..9f2c303145d 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -14,7 +14,6 @@ #![feature(in_band_lifetimes)] #![feature(libc)] #![feature(nll)] -#![feature(rustc_diagnostic_macros)] #![feature(optin_builtin_traits)] #![feature(concat_idents)] #![feature(link_args)] @@ -256,7 +255,7 @@ impl CodegenBackend for LlvmCodegenBackend { } fn diagnostics(&self) -> &[(&'static str, &'static str)] { - &DIAGNOSTICS + &error_codes::DIAGNOSTICS } fn target_features(&self, sess: &Session) -> Vec<Symbol> { @@ -425,5 +424,3 @@ impl Drop for ModuleLlvm { } } } - -__build_diagnostic_array! { librustc_codegen_llvm, DIAGNOSTICS } |