From: Matthew Jasper Date: Sat, 22 Jun 2019 16:13:19 +0000 (+0100) Subject: Deny explicit_outlives_requirements in the compiler X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d0311e71548ad5c7fb259901014552a8279ecb3b;p=rust.git Deny explicit_outlives_requirements in the compiler --- diff --git a/src/librustc/hir/itemlikevisit.rs b/src/librustc/hir/itemlikevisit.rs index bfc9e8f06e2..35b18124583 100644 --- a/src/librustc/hir/itemlikevisit.rs +++ b/src/librustc/hir/itemlikevisit.rs @@ -51,7 +51,7 @@ pub trait ItemLikeVisitor<'hir> { fn visit_impl_item(&mut self, impl_item: &'hir ImplItem); } -pub struct DeepVisitor<'v, V: 'v> { +pub struct DeepVisitor<'v, V> { visitor: &'v mut V, } diff --git a/src/librustc/infer/nll_relate/mod.rs b/src/librustc/infer/nll_relate/mod.rs index 21489965b1b..a1a93eb5521 100644 --- a/src/librustc/infer/nll_relate/mod.rs +++ b/src/librustc/infer/nll_relate/mod.rs @@ -800,7 +800,7 @@ fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool { /// [blog post]: https://is.gd/0hKvIr struct TypeGeneralizer<'me, 'tcx, D> where - D: TypeRelatingDelegate<'tcx> + 'me, + D: TypeRelatingDelegate<'tcx>, { infcx: &'me InferCtxt<'me, 'tcx>, diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index e2f2799d963..257d5159f11 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -31,7 +31,6 @@ #![deny(rust_2018_idioms)] #![deny(internal)] #![deny(unused_lifetimes)] -#![allow(explicit_outlives_requirements)] #![feature(arbitrary_self_types)] #![feature(box_patterns)] diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs index ce785f9a024..28399ed5439 100644 --- a/src/librustc/ty/context.rs +++ b/src/librustc/ty/context.rs @@ -231,7 +231,7 @@ pub struct CommonConsts<'tcx> { pub err: &'tcx Const<'tcx>, } -pub struct LocalTableInContext<'a, V: 'a> { +pub struct LocalTableInContext<'a, V> { local_id_root: Option, data: &'a ItemLocalMap } @@ -294,7 +294,7 @@ fn index(&self, key: hir::HirId) -> &V { } } -pub struct LocalTableInContextMut<'a, V: 'a> { +pub struct LocalTableInContextMut<'a, V> { local_id_root: Option, data: &'a mut ItemLocalMap } @@ -2171,7 +2171,7 @@ pub fn print_debug_stats(self) { /// An entry in an interner. -struct Interned<'tcx, T: 'tcx+?Sized>(&'tcx T); +struct Interned<'tcx, T: ?Sized>(&'tcx T); impl<'tcx, T: 'tcx+?Sized> Clone for Interned<'tcx, T> { fn clone(&self) -> Self { diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs index 0f158d2982a..7d5f984c1b6 100644 --- a/src/librustc/ty/query/plumbing.rs +++ b/src/librustc/ty/query/plumbing.rs @@ -89,7 +89,7 @@ macro_rules! profq_query_msg { /// A type representing the responsibility to execute the job in the `job` field. /// This will poison the relevant query if dropped. -pub(super) struct JobOwner<'a, 'tcx, Q: QueryDescription<'tcx> + 'a> { +pub(super) struct JobOwner<'a, 'tcx, Q: QueryDescription<'tcx>> { cache: &'a Lock>, key: Q::Key, job: Lrc>, @@ -230,7 +230,7 @@ pub struct CycleError<'tcx> { } /// The result of `try_get_lock` -pub(super) enum TryGetJob<'a, 'tcx, D: QueryDescription<'tcx> + 'a> { +pub(super) enum TryGetJob<'a, 'tcx, D: QueryDescription<'tcx>> { /// The query is not yet started. Contains a guard to the cache eventually used to start it. NotYetStarted(JobOwner<'a, 'tcx, D>), diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs index 1eb6e9a5283..7283aa95b30 100644 --- a/src/librustc_codegen_llvm/lib.rs +++ b/src/librustc_codegen_llvm/lib.rs @@ -24,7 +24,6 @@ #![deny(rust_2018_idioms)] #![deny(internal)] #![deny(unused_lifetimes)] -#![allow(explicit_outlives_requirements)] use back::write::{create_target_machine, create_informational_target_machine}; use syntax_pos::symbol::Symbol; diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs index 71393e224e4..b76f098773f 100644 --- a/src/librustc_codegen_ssa/lib.rs +++ b/src/librustc_codegen_ssa/lib.rs @@ -15,7 +15,6 @@ #![deny(rust_2018_idioms)] #![deny(internal)] #![deny(unused_lifetimes)] -#![allow(explicit_outlives_requirements)] #![recursion_limit="256"] diff --git a/src/librustc_mir/dataflow/graphviz.rs b/src/librustc_mir/dataflow/graphviz.rs index f62ad2fbef7..7896592eea6 100644 --- a/src/librustc_mir/dataflow/graphviz.rs +++ b/src/librustc_mir/dataflow/graphviz.rs @@ -30,7 +30,7 @@ fn body(&self) -> &Body<'tcx> { self.flow_state.body() } fn flow_state(&self) -> &DataflowState<'tcx, Self::BD> { &self.flow_state.flow_state } } -struct Graph<'a, 'tcx, MWF:'a, P> where +struct Graph<'a, 'tcx, MWF, P> where MWF: MirWithFlowState<'tcx> { mbcx: &'a MWF, diff --git a/src/librustc_mir/dataflow/mod.rs b/src/librustc_mir/dataflow/mod.rs index 0728d5b21bb..89b952e9f8b 100644 --- a/src/librustc_mir/dataflow/mod.rs +++ b/src/librustc_mir/dataflow/mod.rs @@ -181,7 +181,7 @@ pub(crate) fn run

( struct PropagationContext<'b, 'a, 'tcx, O> where - O: 'b + BitDenotation<'tcx>, + O: BitDenotation<'tcx>, { builder: &'b mut DataflowAnalysis<'a, 'tcx, O>, } diff --git a/src/librustc_mir/interpret/intern.rs b/src/librustc_mir/interpret/intern.rs index d998f40c86e..416b66daa05 100644 --- a/src/librustc_mir/interpret/intern.rs +++ b/src/librustc_mir/interpret/intern.rs @@ -21,7 +21,7 @@ }; use crate::const_eval::{CompileTimeInterpreter, CompileTimeEvalContext}; -struct InternVisitor<'rt, 'mir: 'rt, 'tcx: 'rt + 'mir> { +struct InternVisitor<'rt, 'mir, 'tcx> { /// previously encountered safe references ref_tracking: &'rt mut RefTracking<(MPlaceTy<'tcx>, Mutability, InternMode)>, ecx: &'rt mut CompileTimeEvalContext<'mir, 'tcx>, diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs index a7cbe84330d..cb02e1a778c 100644 --- a/src/librustc_mir/lib.rs +++ b/src/librustc_mir/lib.rs @@ -30,7 +30,6 @@ #![deny(rust_2018_idioms)] #![deny(internal)] #![deny(unused_lifetimes)] -#![allow(explicit_outlives_requirements)] #[macro_use] extern crate log; #[macro_use] diff --git a/src/librustc_mir/util/elaborate_drops.rs b/src/librustc_mir/util/elaborate_drops.rs index 815d210d36e..91fc19b71d8 100644 --- a/src/librustc_mir/util/elaborate_drops.rs +++ b/src/librustc_mir/util/elaborate_drops.rs @@ -92,7 +92,7 @@ pub trait DropElaborator<'a, 'tcx>: fmt::Debug { #[derive(Debug)] struct DropCtxt<'l, 'b, 'tcx, D> where - D: DropElaborator<'b, 'tcx> + 'l, + D: DropElaborator<'b, 'tcx>, { elaborator: &'l mut D, diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs index cc6f7a07d96..ec0f431d9b2 100644 --- a/src/librustc_typeck/lib.rs +++ b/src/librustc_typeck/lib.rs @@ -75,7 +75,6 @@ #![deny(rust_2018_idioms)] #![deny(internal)] #![deny(unused_lifetimes)] -#![allow(explicit_outlives_requirements)] #[macro_use] extern crate log; #[macro_use] extern crate syntax;