Rollup merge of #91893 - pitaj:91867-hir, r=davidtwco
Remove `in_band_lifetimes` from `rustc_hir` #91867
This commit is contained in:
commit
1dde0dbbf5
@ -522,7 +522,7 @@ pub struct GenericParam<'hir> {
|
||||
pub kind: GenericParamKind<'hir>,
|
||||
}
|
||||
|
||||
impl GenericParam<'hir> {
|
||||
impl<'hir> GenericParam<'hir> {
|
||||
pub fn bounds_span_for_suggestions(&self) -> Option<Span> {
|
||||
self.bounds
|
||||
.iter()
|
||||
@ -557,7 +557,7 @@ pub struct Generics<'hir> {
|
||||
pub span: Span,
|
||||
}
|
||||
|
||||
impl Generics<'hir> {
|
||||
impl<'hir> Generics<'hir> {
|
||||
pub const fn empty() -> Generics<'hir> {
|
||||
Generics {
|
||||
params: &[],
|
||||
@ -622,7 +622,7 @@ pub enum WherePredicate<'hir> {
|
||||
EqPredicate(WhereEqPredicate<'hir>),
|
||||
}
|
||||
|
||||
impl WherePredicate<'_> {
|
||||
impl<'hir> WherePredicate<'hir> {
|
||||
pub fn span(&self) -> Span {
|
||||
match self {
|
||||
WherePredicate::BoundPredicate(p) => p.span,
|
||||
@ -644,7 +644,7 @@ pub struct WhereBoundPredicate<'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.
|
||||
pub fn is_param_bound(&self, param_def_id: DefId) -> bool {
|
||||
let path = match self.bounded_ty.kind {
|
||||
@ -1236,7 +1236,7 @@ pub struct Body<'hir> {
|
||||
pub generator_kind: Option<GeneratorKind>,
|
||||
}
|
||||
|
||||
impl Body<'hir> {
|
||||
impl<'hir> Body<'hir> {
|
||||
pub fn id(&self) -> BodyId {
|
||||
BodyId { hir_id: self.value.hir_id }
|
||||
}
|
||||
@ -2623,7 +2623,7 @@ pub enum VariantData<'hir> {
|
||||
Unit(HirId),
|
||||
}
|
||||
|
||||
impl VariantData<'hir> {
|
||||
impl<'hir> VariantData<'hir> {
|
||||
/// Return the fields of this variant.
|
||||
pub fn fields(&self) -> &'hir [FieldDef<'hir>] {
|
||||
match *self {
|
||||
|
@ -139,7 +139,7 @@ pub trait Map<'hir> {
|
||||
}
|
||||
|
||||
// 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>> {
|
||||
unreachable!()
|
||||
}
|
||||
|
@ -4,7 +4,6 @@
|
||||
|
||||
#![feature(const_btree_new)]
|
||||
#![feature(crate_visibility_modifier)]
|
||||
#![feature(in_band_lifetimes)]
|
||||
#![feature(once_cell)]
|
||||
#![feature(min_specialization)]
|
||||
#![feature(never_type)]
|
||||
|
@ -211,7 +211,7 @@ fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
// 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.
|
||||
@ -221,7 +221,7 @@ fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
|
||||
}
|
||||
}
|
||||
|
||||
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) {
|
||||
// We ignore the `map` since it refers to information included in `hash` which is hashed in
|
||||
// the collector and used for the crate hash.
|
||||
|
Loading…
Reference in New Issue
Block a user