Skip to content

Commit 55e69eb

Browse files
committed
rustdoc: Extract method to get item names
1 parent dbe2928 commit 55e69eb

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

src/rustdoc/doc.rs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,16 @@ impl util for moddoc {
122122
}
123123
}
124124
}
125-
}
125+
}
126+
127+
impl util for itemtag {
128+
fn name() -> str {
129+
alt self {
130+
doc::modtag(~{name, _}) { name }
131+
doc::fntag(~{name, _}) { name }
132+
doc::consttag(~{name, _}) { name }
133+
doc::enumtag(~{name, _}) { name }
134+
doc::restag(~{name, _}) { name }
135+
}
136+
}
137+
}

src/rustdoc/prune_unexported_pass.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,6 @@ fn exported_items_from(
6767
is_exported: fn(astsrv::srv, str) -> bool
6868
) -> [doc::itemtag] {
6969
vec::filter_map(doc.items) { |itemtag|
70-
let name = alt itemtag {
71-
doc::modtag(~{name, _}) { name }
72-
doc::fntag(~{name, _}) { name }
73-
doc::consttag(~{name, _}) { name }
74-
doc::enumtag(~{name, _}) { name }
75-
doc::restag(~{name, _}) { name }
76-
};
7770
let itemtag = alt itemtag {
7871
doc::enumtag(enumdoc) {
7972
// Also need to check variant exportedness
@@ -84,7 +77,7 @@ fn exported_items_from(
8477
}
8578
_ { itemtag }
8679
};
87-
if is_exported(srv, name) {
80+
if is_exported(srv, itemtag.name()) {
8881
some(itemtag)
8982
} else {
9083
none

0 commit comments

Comments
 (0)