Skip to content

Commit ec4f213

Browse files
dtolnaydtolnay
committed
Rename DefaultAssocConstItem -> ProvidedAssocConstItem
DefaultAssocConstItem sounds like `default const ITEM: Ty = EXPR` (specialization).
1 parent 3f89ea1 commit ec4f213

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

‎src/librustdoc/clean/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ fn clean_trait_item<'tcx>(trait_item: &hir::TraitItem<'tcx>, cx: &mut DocContext
12231223
cx.with_param_env(local_did, |cx| {
12241224
let inner = match trait_item.kind {
12251225
hir::TraitItemKind::Const(ty, Some(default)) => {
1226-
DefaultAssocConstItem(Box::new(Constant {
1226+
ProvidedAssocConstItem(Box::new(Constant {
12271227
generics: enter_impl_trait(cx, |cx| clean_generics(trait_item.generics, cx)),
12281228
kind: ConstantKind::Local { def_id: local_did, body: default },
12291229
type_: clean_ty(ty, cx),
@@ -1330,7 +1330,7 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13301330
})),
13311331
ty::AssocItemContainer::Trait => {
13321332
if tcx.defaultness(assoc_item.def_id).has_value() {
1333-
DefaultAssocConstItem(Box::new(Constant {
1333+
ProvidedAssocConstItem(Box::new(Constant {
13341334
generics,
13351335
kind: ConstantKind::Extern { def_id: assoc_item.def_id },
13361336
type_: ty,

‎src/librustdoc/clean/types.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ impl Item {
551551
matches!(self.kind, TyAssocTypeItem(..) | StrippedItem(box TyAssocTypeItem(..)))
552552
}
553553
pub(crate) fn is_associated_const(&self) -> bool {
554-
matches!(self.kind, DefaultAssocConstItem(..) | ImplAssocConstItem(..) | StrippedItem(box (DefaultAssocConstItem(..) | ImplAssocConstItem(..))))
554+
matches!(self.kind, ProvidedAssocConstItem(..) | ImplAssocConstItem(..) | StrippedItem(box (ProvidedAssocConstItem(..) | ImplAssocConstItem(..))))
555555
}
556556
pub(crate) fn is_ty_associated_const(&self) -> bool {
557557
matches!(self.kind, RequiredAssocConstItem(..) | StrippedItem(box RequiredAssocConstItem(..)))
@@ -702,7 +702,7 @@ impl Item {
702702
VariantItem(..) | ImplItem(..) => return None,
703703
// Trait items inherit the trait's visibility
704704
RequiredAssocConstItem(..)
705-
| DefaultAssocConstItem(..)
705+
| ProvidedAssocConstItem(..)
706706
| ImplAssocConstItem(..)
707707
| AssocTypeItem(..)
708708
| TyAssocTypeItem(..)
@@ -872,7 +872,7 @@ pub(crate) enum ItemKind {
872872
RequiredAssocConstItem(Generics, Box<Type>),
873873
ConstantItem(Box<Constant>),
874874
/// An associated constant in a trait declaration with provided default value.
875-
DefaultAssocConstItem(Box<Constant>),
875+
ProvidedAssocConstItem(Box<Constant>),
876876
/// An associated constant in an inherent impl or trait impl.
877877
ImplAssocConstItem(Box<Constant>),
878878
/// A required associated type in a trait declaration.
@@ -919,7 +919,7 @@ impl ItemKind {
919919
| ProcMacroItem(_)
920920
| PrimitiveItem(_)
921921
| RequiredAssocConstItem(..)
922-
| DefaultAssocConstItem(..)
922+
| ProvidedAssocConstItem(..)
923923
| ImplAssocConstItem(..)
924924
| TyAssocTypeItem(..)
925925
| AssocTypeItem(..)

‎src/librustdoc/fold.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub(crate) trait DocFolder: Sized {
9292
| ProcMacroItem(_)
9393
| PrimitiveItem(_)
9494
| RequiredAssocConstItem(..)
95-
| DefaultAssocConstItem(..)
95+
| ProvidedAssocConstItem(..)
9696
| ImplAssocConstItem(..)
9797
| TyAssocTypeItem(..)
9898
| AssocTypeItem(..)

‎src/librustdoc/formats/cache.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ impl DocFolder for CacheBuilder<'_, '_> {
338338
| clean::MethodItem(..)
339339
| clean::StructFieldItem(..)
340340
| clean::RequiredAssocConstItem(..)
341-
| clean::DefaultAssocConstItem(..)
341+
| clean::ProvidedAssocConstItem(..)
342342
| clean::ImplAssocConstItem(..)
343343
| clean::TyAssocTypeItem(..)
344344
| clean::AssocTypeItem(..)
@@ -444,7 +444,7 @@ fn add_item_to_search_index(tcx: TyCtxt<'_>, cache: &mut Cache, item: &clean::It
444444
let item_def_id = item.item_id.as_def_id().unwrap();
445445
let (parent_did, parent_path) = match item.kind {
446446
clean::StrippedItem(..) => return,
447-
clean::DefaultAssocConstItem(..)
447+
clean::ProvidedAssocConstItem(..)
448448
| clean::ImplAssocConstItem(..)
449449
| clean::AssocTypeItem(..)
450450
if cache.parent_stack.last().is_some_and(|parent| parent.is_trait_impl()) =>
@@ -471,7 +471,7 @@ fn add_item_to_search_index(tcx: TyCtxt<'_>, cache: &mut Cache, item: &clean::It
471471
(Some(parent_did), parent_path)
472472
}
473473
clean::MethodItem(..)
474-
| clean::DefaultAssocConstItem(..)
474+
| clean::ProvidedAssocConstItem(..)
475475
| clean::ImplAssocConstItem(..)
476476
| clean::AssocTypeItem(..) => {
477477
let last = cache.parent_stack.last().expect("parent_stack is empty 2");

‎src/librustdoc/formats/item_type.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl<'a> From<&'a clean::Item> for ItemType {
9797
clean::MacroItem(..) => ItemType::Macro,
9898
clean::PrimitiveItem(..) => ItemType::Primitive,
9999
clean::RequiredAssocConstItem(..)
100-
| clean::DefaultAssocConstItem(..)
100+
| clean::ProvidedAssocConstItem(..)
101101
| clean::ImplAssocConstItem(..) => ItemType::AssocConst,
102102
clean::TyAssocTypeItem(..) | clean::AssocTypeItem(..) => ItemType::AssocType,
103103
clean::ForeignTypeItem => ItemType::ForeignType,

‎src/librustdoc/html/render/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ fn render_assoc_item(
11071107
if parent == ItemType::Trait { 4 } else { 0 },
11081108
cx,
11091109
),
1110-
clean::DefaultAssocConstItem(ci) => assoc_const(
1110+
clean::ProvidedAssocConstItem(ci) => assoc_const(
11111111
w,
11121112
item,
11131113
&ci.generics,
@@ -1737,7 +1737,7 @@ fn render_impl(
17371737
);
17381738
w.write_str("</h4></section>");
17391739
}
1740-
clean::DefaultAssocConstItem(ci) | clean::ImplAssocConstItem(ci) => {
1740+
clean::ProvidedAssocConstItem(ci) | clean::ImplAssocConstItem(ci) => {
17411741
let source_id = format!("{item_type}.{name}");
17421742
let id = cx.derive_id(&source_id);
17431743
write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
@@ -1753,7 +1753,7 @@ fn render_impl(
17531753
&ci.generics,
17541754
&ci.type_,
17551755
match item.kind {
1756-
clean::DefaultAssocConstItem(_) => AssocConstValue::TraitDefault(&ci.kind),
1756+
clean::ProvidedAssocConstItem(_) => AssocConstValue::TraitDefault(&ci.kind),
17571757
clean::ImplAssocConstItem(_) => AssocConstValue::Impl(&ci.kind),
17581758
_ => unreachable!(),
17591759
},
@@ -1843,7 +1843,7 @@ fn render_impl(
18431843
assoc_types.push(trait_item)
18441844
}
18451845
clean::RequiredAssocConstItem(..)
1846-
| clean::DefaultAssocConstItem(_)
1846+
| clean::ProvidedAssocConstItem(_)
18471847
| clean::ImplAssocConstItem(_) => {
18481848
// We render it directly since they're supposed to come first.
18491849
doc_impl_item(

‎src/librustdoc/json/conversions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ fn from_clean_item(item: clean::Item, renderer: &JsonRenderer<'_>) -> ItemEnum {
343343
ItemEnum::AssocConst { type_: (*ty).into_json(renderer), value: None }
344344
}
345345
// FIXME(generic_const_items): Add support for generic associated consts.
346-
DefaultAssocConstItem(ci) | ImplAssocConstItem(ci) => ItemEnum::AssocConst {
346+
ProvidedAssocConstItem(ci) | ImplAssocConstItem(ci) => ItemEnum::AssocConst {
347347
type_: ci.type_.into_json(renderer),
348348
value: Some(ci.kind.expr(renderer.tcx)),
349349
},

‎src/librustdoc/passes/check_doc_test_visibility.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub(crate) fn should_have_doc_example(cx: &DocContext<'_>, item: &clean::Item) -
7474
| clean::ForeignTypeItem
7575
| clean::AssocTypeItem(..)
7676
| clean::RequiredAssocConstItem(..)
77-
| clean::DefaultAssocConstItem(..)
77+
| clean::ProvidedAssocConstItem(..)
7878
| clean::ImplAssocConstItem(..)
7979
| clean::TyAssocTypeItem(..)
8080
// check for trait impl

‎src/librustdoc/passes/propagate_stability.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl DocFolder for StabilityPropagator<'_, '_> {
7070
| ItemKind::TyMethodItem(..)
7171
| ItemKind::MethodItem(..)
7272
| ItemKind::RequiredAssocConstItem(..)
73-
| ItemKind::DefaultAssocConstItem(..)
73+
| ItemKind::ProvidedAssocConstItem(..)
7474
| ItemKind::ImplAssocConstItem(..)
7575
| ItemKind::TyAssocTypeItem(..)
7676
| ItemKind::AssocTypeItem(..)

‎src/librustdoc/passes/stripper.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl DocFolder for Stripper<'_, '_> {
8080
}
8181

8282
clean::MethodItem(..)
83-
| clean::DefaultAssocConstItem(..)
83+
| clean::ProvidedAssocConstItem(..)
8484
| clean::ImplAssocConstItem(..)
8585
| clean::AssocTypeItem(..) => {
8686
let item_id = i.item_id;

‎src/librustdoc/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub(crate) trait DocVisitor<'a>: Sized {
4545
| ProcMacroItem(_)
4646
| PrimitiveItem(_)
4747
| RequiredAssocConstItem(..)
48-
| DefaultAssocConstItem(..)
48+
| ProvidedAssocConstItem(..)
4949
| ImplAssocConstItem(..)
5050
| TyAssocTypeItem(..)
5151
| AssocTypeItem(..)

0 commit comments

Comments
 (0)