rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #11018 : sfackler/rust/variant-strip, r=alexcrichton

Browse Source 
Previously, if every variant was private, it would display as a
variantless enum instead of having the "some variants stripped" comment.
This commit is contained in:
bors
2013-12-17 23:51:34 -08:00
parent 09b8406638 758f6e6e68
commit 1fee5cd953
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/librustdoc/fold.rs
View File

@@ -24,8 +24,7 @@ pub trait DocFolder {
let inner = inner; let inner = inner;
let c = |x| self.fold_item(x); let c = |x| self.fold_item(x);
let inner = match inner { let inner = match inner {
StructItem(i) => { StructItem(mut i) => {
let mut i = i;
let mut foo = ~[]; swap(&mut foo, &mut i.fields); let mut foo = ~[]; swap(&mut foo, &mut i.fields);
let num_fields = foo.len(); let num_fields = foo.len();
i.fields.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x))); i.fields.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x)));
@@ -35,15 +34,14 @@ pub trait DocFolder {
ModuleItem(i) => { ModuleItem(i) => {
ModuleItem(self.fold_mod(i)) ModuleItem(self.fold_mod(i))
}, },
EnumItem(i) => { EnumItem(mut i) => {
let mut i = i;
let mut foo = ~[]; swap(&mut foo, &mut i.variants); let mut foo = ~[]; swap(&mut foo, &mut i.variants);
let num_variants = foo.len(); let num_variants = foo.len();
i.variants.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x))); i.variants.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x)));
i.variants_stripped |= num_variants != i.variants.len(); i.variants_stripped |= num_variants != i.variants.len();
EnumItem(i) EnumItem(i)
}, },
TraitItem(i) => { TraitItem(mut i) => {
fn vtrm<T: DocFolder>(this: &mut T, trm: TraitMethod) -> Option<TraitMethod> { fn vtrm<T: DocFolder>(this: &mut T, trm: TraitMethod) -> Option<TraitMethod> {
match trm { match trm {
Required(it) => { Required(it) => {
@@ -60,13 +58,11 @@ pub trait DocFolder {
}, },
} }
} }
let mut i = i;
let mut foo = ~[]; swap(&mut foo, &mut i.methods); let mut foo = ~[]; swap(&mut foo, &mut i.methods);
i.methods.extend(&mut foo.move_iter().filter_map(|x| vtrm(self, x))); i.methods.extend(&mut foo.move_iter().filter_map(|x| vtrm(self, x)));
TraitItem(i) TraitItem(i)
}, },
ImplItem(i) => { ImplItem(mut i) => {
let mut i = i;
let mut foo = ~[]; swap(&mut foo, &mut i.methods); let mut foo = ~[]; swap(&mut foo, &mut i.methods);
i.methods.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x))); i.methods.extend(&mut foo.move_iter().filter_map(|x| self.fold_item(x)));
ImplItem(i) ImplItem(i)
@@ -74,8 +70,7 @@ pub trait DocFolder {
VariantItem(i) => { VariantItem(i) => {
let i2 = i.clone(); // this clone is small let i2 = i.clone(); // this clone is small
match i.kind { match i.kind {
StructVariant(j) => { StructVariant(mut j) => {
let mut j = j;
let mut foo = ~[]; swap(&mut foo, &mut j.fields); let mut foo = ~[]; swap(&mut foo, &mut j.fields);
let num_fields = foo.len(); let num_fields = foo.len();
j.fields.extend(&mut foo.move_iter().filter_map(c)); j.fields.extend(&mut foo.move_iter().filter_map(c));

2
src/librustdoc/html/render.rs
View File

@@ -1202,7 +1202,7 @@ fn item_enum(w: &mut Writer, it: &clean::Item, e: &clean::Enum) {
VisSpace(it.visibility), VisSpace(it.visibility),
it.name.get_ref().as_slice(), it.name.get_ref().as_slice(),
e.generics); e.generics);
if e.variants.len() == 0 { if e.variants.len() == 0 && !e.variants_stripped {
write!(w, " \\{\\}"); write!(w, " \\{\\}");
} else { } else {
write!(w, " \\{\n"); write!(w, " \\{\n");