Skip to content

Commit 57e1a47

Browse files
dtolnaydtolnay
committed
Rename TyAssocConstItem -> RequiredAssocConstItem
1 parent 85641f7 commit 57e1a47

File tree

13 files changed

+29
-22
lines changed

13 files changed

+29
-22
lines changed

‎src/librustdoc/clean/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,7 +1229,7 @@ fn clean_trait_item<'tcx>(trait_item: &hir::TraitItem<'tcx>, cx: &mut DocContext
12291229
})),
12301230
hir::TraitItemKind::Const(ty, None) => {
12311231
let generics = enter_impl_trait(cx, |cx| clean_generics(trait_item.generics, cx));
1232-
TyAssocConstItem(generics, Box::new(clean_ty(ty, cx)))
1232+
RequiredAssocConstItem(generics, Box::new(clean_ty(ty, cx)))
12331233
}
12341234
hir::TraitItemKind::Fn(ref sig, hir::TraitFn::Provided(body)) => {
12351235
let m = clean_function(cx, sig, trait_item.generics, FunctionArgs::Body(body));
@@ -1331,7 +1331,7 @@ pub(crate) fn clean_middle_assoc_item(assoc_item: &ty::AssocItem, cx: &mut DocCo
13311331
type_: ty,
13321332
}))
13331333
} else {
1334-
TyAssocConstItem(generics, Box::new(ty))
1334+
RequiredAssocConstItem(generics, Box::new(ty))
13351335
}
13361336
}
13371337
ty::AssocKind::Fn => {

‎src/librustdoc/clean/types.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ impl Item {
553553
pub(crate) fn is_associated_const(&self) -> bool {
554554
matches!(self.kind, AssocConstItem(..) | StrippedItem(box AssocConstItem(..)))
555555
}
556-
pub(crate) fn is_ty_associated_const(&self) -> bool {
557-
matches!(self.kind, TyAssocConstItem(..) | StrippedItem(box TyAssocConstItem(..)))
556+
pub(crate) fn is_required_associated_const(&self) -> bool {
557+
matches!(self.kind, RequiredAssocConstItem(..) | StrippedItem(box RequiredAssocConstItem(..)))
558558
}
559559
pub(crate) fn is_method(&self) -> bool {
560560
self.type_() == ItemType::Method
@@ -701,8 +701,12 @@ impl Item {
701701
// Variants always inherit visibility
702702
VariantItem(..) | ImplItem(..) => return None,
703703
// Trait items inherit the trait's visibility
704-
AssocConstItem(..) | TyAssocConstItem(..) | AssocTypeItem(..) | TyAssocTypeItem(..)
705-
| TyMethodItem(..) | MethodItem(..) => {
704+
AssocConstItem(..)
705+
| RequiredAssocConstItem(..)
706+
| AssocTypeItem(..)
707+
| TyAssocTypeItem(..)
708+
| TyMethodItem(..)
709+
| MethodItem(..) => {
706710
let assoc_item = tcx.associated_item(def_id);
707711
let is_trait_item = match assoc_item.container {
708712
ty::AssocItemContainer::Trait => true,
@@ -864,7 +868,7 @@ pub(crate) enum ItemKind {
864868
ProcMacroItem(ProcMacro),
865869
PrimitiveItem(PrimitiveType),
866870
/// A required associated constant in a trait declaration.
867-
TyAssocConstItem(Generics, Box<Type>),
871+
RequiredAssocConstItem(Generics, Box<Type>),
868872
ConstantItem(Box<Constant>),
869873
/// An associated constant in a trait impl or a provided one in a trait declaration.
870874
AssocConstItem(Box<Constant>),
@@ -911,7 +915,7 @@ impl ItemKind {
911915
| MacroItem(_)
912916
| ProcMacroItem(_)
913917
| PrimitiveItem(_)
914-
| TyAssocConstItem(..)
918+
| RequiredAssocConstItem(..)
915919
| AssocConstItem(..)
916920
| TyAssocTypeItem(..)
917921
| AssocTypeItem(..)

‎src/librustdoc/fold.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pub(crate) trait DocFolder: Sized {
9191
| MacroItem(_)
9292
| ProcMacroItem(_)
9393
| PrimitiveItem(_)
94-
| TyAssocConstItem(..)
94+
| RequiredAssocConstItem(..)
9595
| AssocConstItem(..)
9696
| TyAssocTypeItem(..)
9797
| AssocTypeItem(..)

‎src/librustdoc/formats/cache.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl DocFolder for CacheBuilder<'_, '_> {
337337
| clean::TyMethodItem(..)
338338
| clean::MethodItem(..)
339339
| clean::StructFieldItem(..)
340-
| clean::TyAssocConstItem(..)
340+
| clean::RequiredAssocConstItem(..)
341341
| clean::AssocConstItem(..)
342342
| clean::TyAssocTypeItem(..)
343343
| clean::AssocTypeItem(..)
@@ -450,7 +450,7 @@ fn add_item_to_search_index(tcx: TyCtxt<'_>, cache: &mut Cache, item: &clean::It
450450
return;
451451
}
452452
clean::TyMethodItem(..)
453-
| clean::TyAssocConstItem(..)
453+
| clean::RequiredAssocConstItem(..)
454454
| clean::TyAssocTypeItem(..)
455455
| clean::StructFieldItem(..)
456456
| clean::VariantItem(..) => {

‎src/librustdoc/formats/item_type.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl<'a> From<&'a clean::Item> for ItemType {
9696
clean::ForeignStaticItem(..) => ItemType::Static, // no ForeignStatic
9797
clean::MacroItem(..) => ItemType::Macro,
9898
clean::PrimitiveItem(..) => ItemType::Primitive,
99-
clean::TyAssocConstItem(..) | clean::AssocConstItem(..) => ItemType::AssocConst,
99+
clean::RequiredAssocConstItem(..) | clean::AssocConstItem(..) => ItemType::AssocConst,
100100
clean::TyAssocTypeItem(..) | clean::AssocTypeItem(..) => ItemType::AssocType,
101101
clean::ForeignTypeItem => ItemType::ForeignType,
102102
clean::KeywordItem => ItemType::Keyword,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ fn render_assoc_item(
10811081
clean::MethodItem(m, _) => {
10821082
assoc_method(w, item, &m.generics, &m.decl, link, parent, cx, render_mode)
10831083
}
1084-
clean::TyAssocConstItem(generics, ty) => assoc_const(
1084+
clean::RequiredAssocConstItem(generics, ty) => assoc_const(
10851085
w,
10861086
item,
10871087
generics,
@@ -1689,7 +1689,7 @@ fn render_impl(
16891689
w.write_str("</h4></section>");
16901690
}
16911691
}
1692-
clean::TyAssocConstItem(ref generics, ref ty) => {
1692+
clean::RequiredAssocConstItem(ref generics, ref ty) => {
16931693
let source_id = format!("{item_type}.{name}");
16941694
let id = cx.derive_id(&source_id);
16951695
write!(w, "<section id=\"{id}\" class=\"{item_type}{in_trait_class}\">");
@@ -1812,7 +1812,7 @@ fn render_impl(
18121812
clean::TyAssocTypeItem(..) | clean::AssocTypeItem(..) => {
18131813
assoc_types.push(trait_item)
18141814
}
1815-
clean::TyAssocConstItem(..) | clean::AssocConstItem(_) => {
1815+
clean::RequiredAssocConstItem(..) | clean::AssocConstItem(_) => {
18161816
// We render it directly since they're supposed to come first.
18171817
doc_impl_item(
18181818
&mut default_impl_items,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,8 @@ fn item_trait(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, t: &clean::Tra
653653
let bounds = bounds(&t.bounds, false, cx);
654654
let required_types = t.items.iter().filter(|m| m.is_ty_associated_type()).collect::<Vec<_>>();
655655
let provided_types = t.items.iter().filter(|m| m.is_associated_type()).collect::<Vec<_>>();
656-
let required_consts = t.items.iter().filter(|m| m.is_ty_associated_const()).collect::<Vec<_>>();
656+
let required_consts =
657+
t.items.iter().filter(|m| m.is_required_associated_const()).collect::<Vec<_>>();
657658
let provided_consts = t.items.iter().filter(|m| m.is_associated_const()).collect::<Vec<_>>();
658659
let required_methods = t.items.iter().filter(|m| m.is_ty_method()).collect::<Vec<_>>();
659660
let provided_methods = t.items.iter().filter(|m| m.is_method()).collect::<Vec<_>>();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ fn sidebar_trait<'a>(
285285
let req_assoc = filter_items(&t.items, |m| m.is_ty_associated_type(), "associatedtype");
286286
let prov_assoc = filter_items(&t.items, |m| m.is_associated_type(), "associatedtype");
287287
let req_assoc_const =
288-
filter_items(&t.items, |m| m.is_ty_associated_const(), "associatedconstant");
288+
filter_items(&t.items, |m| m.is_required_associated_const(), "associatedconstant");
289289
let prov_assoc_const =
290290
filter_items(&t.items, |m| m.is_associated_const(), "associatedconstant");
291291
let req_method = filter_items(&t.items, |m| m.is_ty_method(), "tymethod");

‎src/librustdoc/json/conversions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ fn from_clean_item(item: clean::Item, renderer: &JsonRenderer<'_>) -> ItemEnum {
339339
})
340340
}
341341
// FIXME(generic_const_items): Add support for generic associated consts.
342-
TyAssocConstItem(_generics, ty) => {
342+
RequiredAssocConstItem(_generics, ty) => {
343343
ItemEnum::AssocConst { type_: (*ty).into_json(renderer), value: None }
344344
}
345345
// FIXME(generic_const_items): Add support for generic associated consts.

‎src/librustdoc/passes/check_doc_test_visibility.rs

Lines changed: 1 addition & 1 deletion
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::AssocConstItem(..)
7676
| clean::AssocTypeItem(..)
77-
| clean::TyAssocConstItem(..)
77+
| clean::RequiredAssocConstItem(..)
7878
| clean::TyAssocTypeItem(..)
7979
// check for trait impl
8080
| clean::ImplItem(box clean::Impl { trait_: Some(_), .. })

‎src/librustdoc/passes/propagate_stability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl DocFolder for StabilityPropagator<'_, '_> {
6969
ItemKind::ImplItem(..)
7070
| ItemKind::TyMethodItem(..)
7171
| ItemKind::MethodItem(..)
72-
| ItemKind::TyAssocConstItem(..)
72+
| ItemKind::RequiredAssocConstItem(..)
7373
| ItemKind::AssocConstItem(..)
7474
| ItemKind::TyAssocTypeItem(..)
7575
| ItemKind::AssocTypeItem(..)

‎src/librustdoc/passes/stripper.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ impl DocFolder for Stripper<'_, '_> {
118118
clean::ImplItem(..) => {}
119119

120120
// tymethods etc. have no control over privacy
121-
clean::TyMethodItem(..) | clean::TyAssocConstItem(..) | clean::TyAssocTypeItem(..) => {}
121+
clean::TyMethodItem(..)
122+
| clean::RequiredAssocConstItem(..)
123+
| clean::TyAssocTypeItem(..) => {}
122124

123125
// Proc-macros are always public
124126
clean::ProcMacroItem(..) => {}

‎src/librustdoc/visit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub(crate) trait DocVisitor<'a>: Sized {
4444
| MacroItem(_)
4545
| ProcMacroItem(_)
4646
| PrimitiveItem(_)
47-
| TyAssocConstItem(..)
47+
| RequiredAssocConstItem(..)
4848
| AssocConstItem(..)
4949
| TyAssocTypeItem(..)
5050
| AssocTypeItem(..)

0 commit comments

Comments
 (0)