Skip to content

Commit ca5c68a

Browse files
borsbors
committed
Auto merge of #119002 - workingjubilee:rollup-dbfet7s, r=workingjubilee
Rollup of 5 pull requests Successful merges: - #118396 (Collect lang items from AST, get rid of `GenericBound::LangItemTrait`) - #118727 (Don't pass lint back out of lint decorator) - #118956 (Make CStr documentation consistent ("nul" instead of "null")) - #118981 (Remove an unneeded allocation) - #118998 (Link to is_benchmark from the Ipv6Addr::is_global documentation) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a96d57b + 4b447b8 commit ca5c68a

File tree

70 files changed

+559
-567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+559
-567
lines changed

‎compiler/rustc_ast/src/ast.rs

+22
Original file line numberDiff line numberDiff line change
@@ -2845,6 +2845,28 @@ impl Item {
28452845
pub fn span_with_attributes(&self) -> Span {
28462846
self.attrs.iter().fold(self.span, |acc, attr| acc.to(attr.span))
28472847
}
2848+
2849+
pub fn opt_generics(&self) -> Option<&Generics> {
2850+
match &self.kind {
2851+
ItemKind::ExternCrate(_)
2852+
| ItemKind::Use(_)
2853+
| ItemKind::Mod(_, _)
2854+
| ItemKind::ForeignMod(_)
2855+
| ItemKind::GlobalAsm(_)
2856+
| ItemKind::MacCall(_)
2857+
| ItemKind::MacroDef(_) => None,
2858+
ItemKind::Static(_) => None,
2859+
ItemKind::Const(i) => Some(&i.generics),
2860+
ItemKind::Fn(i) => Some(&i.generics),
2861+
ItemKind::TyAlias(i) => Some(&i.generics),
2862+
ItemKind::TraitAlias(generics, _)
2863+
| ItemKind::Enum(_, generics)
2864+
| ItemKind::Struct(_, generics)
2865+
| ItemKind::Union(_, generics) => Some(&generics),
2866+
ItemKind::Trait(i) => Some(&i.generics),
2867+
ItemKind::Impl(i) => Some(&i.generics),
2868+
}
2869+
}
28482870
}
28492871

28502872
/// `extern` qualifier on a function item or function type.

‎compiler/rustc_ast_lowering/src/lib.rs

+38-6
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ pub fn lower_to_hir(tcx: TyCtxt<'_>, (): ()) -> hir::Crate<'_> {
453453
tcx.ensure_with_value().output_filenames(());
454454
tcx.ensure_with_value().early_lint_checks(());
455455
tcx.ensure_with_value().debugger_visualizers(LOCAL_CRATE);
456+
tcx.ensure_with_value().get_lang_items(());
456457
let (mut resolver, krate) = tcx.resolver_for_lowering(()).steal();
457458

458459
let ast_index = index_crate(&resolver.node_id_to_def_id, &krate);
@@ -765,6 +766,28 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
765766
self.resolver.get_import_res(id).present_items()
766767
}
767768

769+
fn make_lang_item_path(
770+
&mut self,
771+
lang_item: hir::LangItem,
772+
span: Span,
773+
args: Option<&'hir hir::GenericArgs<'hir>>,
774+
) -> &'hir hir::Path<'hir> {
775+
let def_id = self.tcx.require_lang_item(lang_item, Some(span));
776+
let def_kind = self.tcx.def_kind(def_id);
777+
let res = Res::Def(def_kind, def_id);
778+
self.arena.alloc(hir::Path {
779+
span,
780+
res,
781+
segments: self.arena.alloc_from_iter([hir::PathSegment {
782+
ident: Ident::new(lang_item.name(), span),
783+
hir_id: self.next_id(),
784+
res,
785+
args,
786+
infer_args: false,
787+
}]),
788+
})
789+
}
790+
768791
/// Reuses the span but adds information like the kind of the desugaring and features that are
769792
/// allowed inside this span.
770793
fn mark_span_with_reason(
@@ -1976,18 +1999,27 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
19761999
CoroutineKind::AsyncGen { .. } => (sym::Item, hir::LangItem::AsyncIterator),
19772000
};
19782001

1979-
let future_args = self.arena.alloc(hir::GenericArgs {
2002+
let bound_args = self.arena.alloc(hir::GenericArgs {
19802003
args: &[],
19812004
bindings: arena_vec![self; self.assoc_ty_binding(assoc_ty_name, opaque_ty_span, output_ty)],
19822005
parenthesized: hir::GenericArgsParentheses::No,
19832006
span_ext: DUMMY_SP,
19842007
});
19852008

1986-
hir::GenericBound::LangItemTrait(
1987-
trait_lang_item,
1988-
opaque_ty_span,
1989-
self.next_id(),
1990-
future_args,
2009+
hir::GenericBound::Trait(
2010+
hir::PolyTraitRef {
2011+
bound_generic_params: &[],
2012+
trait_ref: hir::TraitRef {
2013+
path: self.make_lang_item_path(
2014+
trait_lang_item,
2015+
opaque_ty_span,
2016+
Some(bound_args),
2017+
),
2018+
hir_ref_id: self.next_id(),
2019+
},
2020+
span: opaque_ty_span,
2021+
},
2022+
hir::TraitBoundModifier::None,
19912023
)
19922024
}
19932025

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

+10-20
Original file line numberDiff line numberDiff line change
@@ -788,28 +788,18 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
788788
};
789789
let opaque_ty = hir.item(id);
790790
if let hir::ItemKind::OpaqueTy(hir::OpaqueTy {
791-
bounds:
792-
[
793-
hir::GenericBound::LangItemTrait(
794-
hir::LangItem::Future,
795-
_,
796-
_,
797-
hir::GenericArgs {
798-
bindings:
799-
[
800-
hir::TypeBinding {
801-
ident: Ident { name: sym::Output, .. },
802-
kind:
803-
hir::TypeBindingKind::Equality { term: hir::Term::Ty(ty) },
804-
..
805-
},
806-
],
807-
..
808-
},
809-
),
810-
],
791+
bounds: [hir::GenericBound::Trait(trait_ref, _)],
811792
..
812793
}) = opaque_ty.kind
794+
&& let Some(segment) = trait_ref.trait_ref.path.segments.last()
795+
&& let Some(args) = segment.args
796+
&& let [
797+
hir::TypeBinding {
798+
ident: Ident { name: sym::Output, .. },
799+
kind: hir::TypeBindingKind::Equality { term: hir::Term::Ty(ty) },
800+
..
801+
},
802+
] = args.bindings
813803
{
814804
ty
815805
} else {

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,9 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
578578
hir_id,
579579
no_sanitize_span,
580580
"`no_sanitize` will have no effect after inlining",
581-
|lint| lint.span_note(inline_span, "inlining requested here"),
581+
|lint| {
582+
lint.span_note(inline_span, "inlining requested here");
583+
},
582584
)
583585
}
584586
}

‎compiler/rustc_hir/src/hir.rs

-3
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,6 @@ pub enum TraitBoundModifier {
435435
#[derive(Clone, Copy, Debug, HashStable_Generic)]
436436
pub enum GenericBound<'hir> {
437437
Trait(PolyTraitRef<'hir>, TraitBoundModifier),
438-
// FIXME(davidtwco): Introduce `PolyTraitRef::LangItem`
439-
LangItemTrait(LangItem, Span, HirId, &'hir GenericArgs<'hir>),
440438
Outlives(&'hir Lifetime),
441439
}
442440

@@ -451,7 +449,6 @@ impl GenericBound<'_> {
451449
pub fn span(&self) -> Span {
452450
match self {
453451
GenericBound::Trait(t, ..) => t.span,
454-
GenericBound::LangItemTrait(_, span, ..) => *span,
455452
GenericBound::Outlives(l) => l.ident.span,
456453
}
457454
}

‎compiler/rustc_hir/src/intravisit.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1075,10 +1075,6 @@ pub fn walk_param_bound<'v, V: Visitor<'v>>(visitor: &mut V, bound: &'v GenericB
10751075
GenericBound::Trait(ref typ, _modifier) => {
10761076
visitor.visit_poly_trait_ref(typ);
10771077
}
1078-
GenericBound::LangItemTrait(_, _span, hir_id, args) => {
1079-
visitor.visit_id(hir_id);
1080-
visitor.visit_generic_args(args);
1081-
}
10821078
GenericBound::Outlives(ref lifetime) => visitor.visit_lifetime(lifetime),
10831079
}
10841080
}

‎compiler/rustc_hir/src/target.rs

+36
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,42 @@ impl Display for Target {
6767
}
6868

6969
impl Target {
70+
pub fn is_associated_item(self) -> bool {
71+
match self {
72+
Target::AssocConst | Target::AssocTy | Target::Method(_) => true,
73+
Target::ExternCrate
74+
| Target::Use
75+
| Target::Static
76+
| Target::Const
77+
| Target::Fn
78+
| Target::Closure
79+
| Target::Mod
80+
| Target::ForeignMod
81+
| Target::GlobalAsm
82+
| Target::TyAlias
83+
| Target::OpaqueTy
84+
| Target::Enum
85+
| Target::Variant
86+
| Target::Struct
87+
| Target::Field
88+
| Target::Union
89+
| Target::Trait
90+
| Target::TraitAlias
91+
| Target::Impl
92+
| Target::Expression
93+
| Target::Statement
94+
| Target::Arm
95+
| Target::ForeignFn
96+
| Target::ForeignStatic
97+
| Target::ForeignTy
98+
| Target::GenericParam(_)
99+
| Target::MacroDef
100+
| Target::Param
101+
| Target::PatField
102+
| Target::ExprField => false,
103+
}
104+
}
105+
70106
pub fn from_item(item: &Item<'_>) -> Target {
71107
match item.kind {
72108
ItemKind::ExternCrate(..) => Target::ExternCrate,

‎compiler/rustc_hir_analysis/src/astconv/bounds.rs

-11
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,6 @@ impl<'tcx> dyn AstConv<'tcx> + '_ {
134134
only_self_bounds,
135135
);
136136
}
137-
&hir::GenericBound::LangItemTrait(lang_item, span, hir_id, args) => {
138-
self.instantiate_lang_item_trait_ref(
139-
lang_item,
140-
span,
141-
hir_id,
142-
args,
143-
param_ty,
144-
bounds,
145-
only_self_bounds,
146-
);
147-
}
148137
hir::GenericBound::Outlives(lifetime) => {
149138
let region = self.ast_region_to_region(lifetime, None);
150139
bounds.push_region_bound(

‎compiler/rustc_hir_analysis/src/astconv/generics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ pub(crate) fn prohibit_explicit_late_bound_lifetimes(
661661
args.args[0].hir_id(),
662662
multispan,
663663
msg,
664-
|lint| lint,
664+
|_| {},
665665
);
666666
}
667667

‎compiler/rustc_hir_analysis/src/astconv/lint.rs

-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
122122
Applicability::MachineApplicable,
123123
);
124124
self.maybe_lint_blanket_trait_impl(self_ty, lint);
125-
lint
126125
},
127126
);
128127
}

0 commit comments

Comments
 (0)