diff options
| author | bors <bors@rust-lang.org> | 2020-01-04 06:20:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-04 06:20:09 +0000 |
| commit | abf2e00e38ad404d563f03acbcf06b08813fd086 (patch) | |
| tree | d736ed8757b6dc4704a8ae35214e56f928710be1 /src/librustc_codegen_utils/codegen_backend.rs | |
| parent | e845e691c988303ea54cb9de9639a8577b5a9d6b (diff) | |
| parent | 745f771484e4564acf3f77fc56836db4f0b83264 (diff) | |
| download | rust-abf2e00e38ad404d563f03acbcf06b08813fd086.tar.gz rust-abf2e00e38ad404d563f03acbcf06b08813fd086.zip | |
Auto merge of #67853 - Centril:rollup-sx5zi9n, r=Centril
Rollup of 8 pull requests Successful merges: - #66913 (Suggest calling method when first argument is `self`) - #67531 (no longer promote non-pattern const functions) - #67773 (Add a test for #37333) - #67786 (Nix reexports from `rustc_span` in `syntax`) - #67789 (Cleanup linkchecker whitelist) - #67810 (Implement uncommon_codepoints lint.) - #67835 (tweak wording of mismatched delimiter errors) - #67845 (Also remove const-hack for abs) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils/codegen_backend.rs')
| -rw-r--r-- | src/librustc_codegen_utils/codegen_backend.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs index 0737fd6b5ca..fecb3986e7e 100644 --- a/src/librustc_codegen_utils/codegen_backend.rs +++ b/src/librustc_codegen_utils/codegen_backend.rs @@ -15,7 +15,7 @@ use rustc::session::Session; use rustc::ty::query::Providers; use rustc::ty::TyCtxt; use rustc::util::common::ErrorReported; -use syntax::symbol::Symbol; +use rustc_span::symbol::Symbol; pub use rustc_data_structures::sync::MetadataRef; |