diff options
| author | bors <bors@rust-lang.org> | 2019-10-25 00:40:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-25 00:40:55 +0000 |
| commit | d54111afc061ef398cd8ce28984f9e8d70001b24 (patch) | |
| tree | 4e68a43ce1cde8526dd1ce1229ed297a8182a1b4 /src/librustc_codegen_utils/codegen_backend.rs | |
| parent | 10a52c25cad963986cace7a22c167363afca0d74 (diff) | |
| parent | fd6795b46a249d33c0127f77e08019b401a67fc5 (diff) | |
| download | rust-d54111afc061ef398cd8ce28984f9e8d70001b24.tar.gz rust-d54111afc061ef398cd8ce28984f9e8d70001b24.zip | |
Auto merge of #65771 - Centril:rollup-upfsvrb, r=Centril
Rollup of 8 pull requests Successful merges: - #65625 (Turn crate store into a resolver output) - #65627 (Forbid non-`structural_match` types in const generics) - #65710 (Update cargo) - #65729 (Update test cases for vxWorks) - #65746 (Tweak format string error to point at arguments always) - #65753 (Don't assert for different instance on impl trait alias) - #65755 (Avoid ICE when adjusting bad self ty) - #65766 (Update hashbrown to 0.6.2) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_utils/codegen_backend.rs')
| -rw-r--r-- | src/librustc_codegen_utils/codegen_backend.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs index 1077c1f4263..0e2c3731eae 100644 --- a/src/librustc_codegen_utils/codegen_backend.rs +++ b/src/librustc_codegen_utils/codegen_backend.rs @@ -14,7 +14,7 @@ use rustc::util::common::ErrorReported; use rustc::session::config::{OutputFilenames, PrintRequest}; use rustc::ty::TyCtxt; use rustc::ty::query::Providers; -use rustc::middle::cstore::{EncodedMetadata, MetadataLoader}; +use rustc::middle::cstore::{EncodedMetadata, MetadataLoaderDyn}; use rustc::dep_graph::DepGraph; pub use rustc_data_structures::sync::MetadataRef; @@ -26,7 +26,7 @@ pub trait CodegenBackend { fn print_passes(&self) {} fn print_version(&self) {} - fn metadata_loader(&self) -> Box<dyn MetadataLoader + Sync>; + fn metadata_loader(&self) -> Box<MetadataLoaderDyn>; fn provide(&self, _providers: &mut Providers<'_>); fn provide_extern(&self, _providers: &mut Providers<'_>); fn codegen_crate<'tcx>( |