bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove in_band_lifetimes from rustc_hir

Browse source
This commit is contained in:
Peter Jaszkowiak 2021-12-13 21:33:53 -07:00
parent 8f117a77d0
commit 7085b4e117
4 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_hir/src/hir.rs
View file

@ -522,7 +522,7 @@ pub struct GenericParam<'hir> {
pub kind: GenericParamKind<'hir>, pub kind: GenericParamKind<'hir>,
} }
impl GenericParam<'hir> { impl<'hir> GenericParam<'hir> {
pub fn bounds_span_for_suggestions(&self) -> Option<Span> { pub fn bounds_span_for_suggestions(&self) -> Option<Span> {
self.bounds self.bounds
.iter() .iter()
@ -557,7 +557,7 @@ pub struct Generics<'hir> {
pub span: Span, pub span: Span,
} }
impl Generics<'hir> { impl<'hir> Generics<'hir> {
pub const fn empty() -> Generics<'hir> { pub const fn empty() -> Generics<'hir> {
Generics { Generics {
params: &[], params: &[],
@ -622,7 +622,7 @@ pub enum WherePredicate<'hir> {
EqPredicate(WhereEqPredicate<'hir>), EqPredicate(WhereEqPredicate<'hir>),
} }
impl WherePredicate<'_> { impl<'hir> WherePredicate<'hir> {
pub fn span(&self) -> Span { pub fn span(&self) -> Span {
match self { match self {
WherePredicate::BoundPredicate(p) => p.span, WherePredicate::BoundPredicate(p) => p.span,
@ -644,7 +644,7 @@ pub struct WhereBoundPredicate<'hir> {
pub bounds: GenericBounds<'hir>, pub bounds: GenericBounds<'hir>,
} }
impl WhereBoundPredicate<'hir> { impl<'hir> WhereBoundPredicate<'hir> {
/// Returns `true` if `param_def_id` matches the `bounded_ty` of this predicate. /// Returns `true` if `param_def_id` matches the `bounded_ty` of this predicate.
pub fn is_param_bound(&self, param_def_id: DefId) -> bool { pub fn is_param_bound(&self, param_def_id: DefId) -> bool {
let path = match self.bounded_ty.kind { let path = match self.bounded_ty.kind {
@ -1236,7 +1236,7 @@ pub struct Body<'hir> {
pub generator_kind: Option<GeneratorKind>, pub generator_kind: Option<GeneratorKind>,
} }
impl Body<'hir> { impl<'hir> Body<'hir> {
pub fn id(&self) -> BodyId { pub fn id(&self) -> BodyId {
BodyId { hir_id: self.value.hir_id } BodyId { hir_id: self.value.hir_id }
} }
@ -2623,7 +2623,7 @@ pub enum VariantData<'hir> {
Unit(HirId), Unit(HirId),
} }
impl VariantData<'hir> { impl<'hir> VariantData<'hir> {
/// Return the fields of this variant. /// Return the fields of this variant.
pub fn fields(&self) -> &'hir [FieldDef<'hir>] { pub fn fields(&self) -> &'hir [FieldDef<'hir>] {
match *self { match *self {

2
compiler/rustc_hir/src/intravisit.rs
View file

@ -139,7 +139,7 @@ pub trait Map<'hir> {
} }
// Used when no map is actually available, forcing manual implementation of nested visitors. // Used when no map is actually available, forcing manual implementation of nested visitors.
impl Map<'hir> for ! { impl<'hir> Map<'hir> for ! {
fn find(&self, _: HirId) -> Option<Node<'hir>> { fn find(&self, _: HirId) -> Option<Node<'hir>> {
unreachable!() unreachable!()
} }

1
compiler/rustc_hir/src/lib.rs
View file

@ -4,7 +4,6 @@
#![feature(const_btree_new)] #![feature(const_btree_new)]
#![feature(crate_visibility_modifier)] #![feature(crate_visibility_modifier)]
#![feature(in_band_lifetimes)]
#![feature(once_cell)] #![feature(once_cell)]
#![feature(min_specialization)] #![feature(min_specialization)]
#![feature(never_type)] #![feature(never_type)]

4
compiler/rustc_hir/src/stable_hash_impls.rs
View file

@ -211,7 +211,7 @@ impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for Item<'_> {
} }
} }
impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for OwnerNodes<'tcx> { impl<'tcx, HirCtx: crate::HashStableContext> HashStable<HirCtx> for OwnerNodes<'tcx> {
fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
// We ignore the `nodes` and `bodies` fields since these refer to information included in // We ignore the `nodes` and `bodies` fields since these refer to information included in
// `hash` which is hashed in the collector and used for the crate hash. // `hash` which is hashed in the collector and used for the crate hash.
@ -221,7 +221,7 @@ impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for OwnerNodes<'tcx> {
} }
} }
impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for AttributeMap<'tcx> { impl<'tcx, HirCtx: crate::HashStableContext> HashStable<HirCtx> for AttributeMap<'tcx> {
fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) { fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
// We ignore the `map` since it refers to information included in `hash` which is hashed in // We ignore the `map` since it refers to information included in `hash` which is hashed in
// the collector and used for the crate hash. // the collector and used for the crate hash.