Auto merge of #143267 - matthiaskrgr:rollup-suvzar6, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang/rust#143125 (Disable f16 on Aarch64 without neon for llvm < 20.1.1) - rust-lang/rust#143156 (inherit `#[align]` from trait method prototypes) - rust-lang/rust#143178 (rustdoc default faviocon) - rust-lang/rust#143234 (Replace `ItemCtxt::report_placeholder_type_error` match with a call to `TyCtxt::def_descr`) - rust-lang/rust#143245 (mbe: Add tests and restructure metavariable expressions) - rust-lang/rust#143257 (Upgrade dependencies in run-make-support) - rust-lang/rust#143263 (linkify CodeSuggestion in doc comments) - rust-lang/rust#143264 (fix: Emit suggestion filename if primary diagnostic span is dummy) Failed merges: - rust-lang/rust#143251 (bootstrap: add build.tidy-extra-checks option) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
@@ -3141,15 +3141,6 @@ pub enum TraitItemKind<'hir> {
|
||||
/// type.
|
||||
Type(GenericBounds<'hir>, Option<&'hir Ty<'hir>>),
|
||||
}
|
||||
impl TraitItemKind<'_> {
|
||||
pub fn descr(&self) -> &'static str {
|
||||
match self {
|
||||
TraitItemKind::Const(..) => "associated constant",
|
||||
TraitItemKind::Fn(..) => "function",
|
||||
TraitItemKind::Type(..) => "associated type",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The bodies for items are stored "out of line", in a separate
|
||||
// hashmap in the `Crate`. Here we just record the hir-id of the item
|
||||
@@ -3211,15 +3202,6 @@ pub enum ImplItemKind<'hir> {
|
||||
/// An associated type.
|
||||
Type(&'hir Ty<'hir>),
|
||||
}
|
||||
impl ImplItemKind<'_> {
|
||||
pub fn descr(&self) -> &'static str {
|
||||
match self {
|
||||
ImplItemKind::Const(..) => "associated constant",
|
||||
ImplItemKind::Fn(..) => "function",
|
||||
ImplItemKind::Type(..) => "associated type",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A constraint on an associated item.
|
||||
///
|
||||
@@ -4545,16 +4527,6 @@ pub enum ForeignItemKind<'hir> {
|
||||
Type,
|
||||
}
|
||||
|
||||
impl ForeignItemKind<'_> {
|
||||
pub fn descr(&self) -> &'static str {
|
||||
match self {
|
||||
ForeignItemKind::Fn(..) => "function",
|
||||
ForeignItemKind::Static(..) => "static variable",
|
||||
ForeignItemKind::Type => "type",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// A variable captured by a closure.
|
||||
#[derive(Debug, Copy, Clone, HashStable_Generic)]
|
||||
pub struct Upvar {
|
||||
|
||||
Reference in New Issue
Block a user