diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2020-07-05 23:00:14 +0300 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2020-07-05 23:00:14 +0300 |
| commit | f07100afc8650101ac924d728521e1a5d0ce9080 (patch) | |
| tree | 82e8f3dfe9a9e76aa68e70af7f33dea56bdea743 /src/librustc_interface | |
| parent | f25811e34bf89c3dde760d826ad4662c245be202 (diff) | |
Use for<'tcx> fn pointers in Providers, instead of having Providers<'tcx>.
Diffstat (limited to 'src/librustc_interface')
| -rw-r--r-- | src/librustc_interface/interface.rs | 4 | ||||
| -rw-r--r-- | src/librustc_interface/passes.rs | 4 | ||||
| -rw-r--r-- | src/librustc_interface/proc_macro_decls.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_interface/interface.rs b/src/librustc_interface/interface.rs index 920cc6021e6..570104e09b8 100644 --- a/src/librustc_interface/interface.rs +++ b/src/librustc_interface/interface.rs @@ -38,7 +38,7 @@ pub struct Compiler { pub(crate) crate_name: Option<String>, pub(crate) register_lints: Option<Box<dyn Fn(&Session, &mut LintStore) + Send + Sync>>, pub(crate) override_queries: - Option<fn(&Session, &mut ty::query::Providers<'_>, &mut ty::query::Providers<'_>)>, + Option<fn(&Session, &mut ty::query::Providers, &mut ty::query::Providers)>, } impl Compiler { @@ -153,7 +153,7 @@ pub struct Config { /// /// The second parameter is local providers and the third parameter is external providers. pub override_queries: - Option<fn(&Session, &mut ty::query::Providers<'_>, &mut ty::query::Providers<'_>)>, + Option<fn(&Session, &mut ty::query::Providers, &mut ty::query::Providers)>, /// Registry of diagnostics codes. pub registry: Registry, diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs index ed5e715ce70..6d85c2f1825 100644 --- a/src/librustc_interface/passes.rs +++ b/src/librustc_interface/passes.rs @@ -719,7 +719,7 @@ pub fn prepare_outputs( Ok(outputs) } -pub fn default_provide(providers: &mut ty::query::Providers<'_>) { +pub fn default_provide(providers: &mut ty::query::Providers) { providers.analysis = analysis; proc_macro_decls::provide(providers); plugin::build::provide(providers); @@ -740,7 +740,7 @@ pub fn default_provide(providers: &mut ty::query::Providers<'_>) { rustc_codegen_ssa::provide(providers); } -pub fn default_provide_extern(providers: &mut ty::query::Providers<'_>) { +pub fn default_provide_extern(providers: &mut ty::query::Providers) { rustc_metadata::provide_extern(providers); rustc_codegen_ssa::provide_extern(providers); } diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs index c74cba81ca9..e91003b450c 100644 --- a/src/librustc_interface/proc_macro_decls.rs +++ b/src/librustc_interface/proc_macro_decls.rs @@ -35,6 +35,6 @@ impl<'v> ItemLikeVisitor<'v> for Finder { fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {} } -pub(crate) fn provide(providers: &mut Providers<'_>) { +pub(crate) fn provide(providers: &mut Providers) { *providers = Providers { proc_macro_decls_static, ..*providers }; } |
