Skip to content

Commit 8e4bcdf

Browse files
committed
List all cases explicitly in Doc{Folder,Visitor}
1 parent c03cab3 commit 8e4bcdf

File tree

4 files changed

+45
-6
lines changed

4 files changed

+45
-6
lines changed

src/librustdoc/fold.rs

+20-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,26 @@ crate trait DocFolder: Sized {
6060
}
6161
Variant::CLike => VariantItem(Variant::CLike),
6262
},
63-
// FIXME: list all cases explicitly
64-
x => x,
63+
ExternCrateItem { src: _ }
64+
| ImportItem(_)
65+
| FunctionItem(_)
66+
| TypedefItem(_, _)
67+
| OpaqueTyItem(_)
68+
| StaticItem(_)
69+
| ConstantItem(_)
70+
| TraitAliasItem(_)
71+
| TyMethodItem(_)
72+
| MethodItem(_, _)
73+
| StructFieldItem(_)
74+
| ForeignFunctionItem(_)
75+
| ForeignStaticItem(_)
76+
| ForeignTypeItem
77+
| MacroItem(_)
78+
| ProcMacroItem(_)
79+
| PrimitiveItem(_)
80+
| AssocConstItem(_, _)
81+
| AssocTypeItem(_, _)
82+
| KeywordItem(_) => kind,
6583
}
6684
}
6785

src/librustdoc/passes/collect_trait_impls.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use super::Pass;
2+
use crate::clean::*;
23
use crate::core::DocContext;
3-
use crate::{clean::*, visit::DocVisitor};
4+
use crate::visit::DocVisitor;
45

56
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
67
use rustc_hir::def_id::DefId;

src/librustdoc/passes/html_tags.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ use crate::clean::*;
33
use crate::core::DocContext;
44
use crate::html::markdown::main_body_opts;
55
use crate::visit::DocVisitor;
6-
use core::ops::Range;
6+
77
use pulldown_cmark::{Event, Parser, Tag};
8+
89
use std::iter::Peekable;
10+
use std::ops::Range;
911
use std::str::CharIndices;
1012

1113
crate const CHECK_INVALID_HTML_TAGS: Pass = Pass {

src/librustdoc/visit.rs

+20-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,26 @@ crate trait DocVisitor: Sized {
2323
Variant::Tuple(fields) => fields.iter().for_each(|x| self.visit_item(x)),
2424
Variant::CLike => {}
2525
},
26-
// FIXME: list all cases explicitly
27-
_ => return,
26+
ExternCrateItem { src: _ }
27+
| ImportItem(_)
28+
| FunctionItem(_)
29+
| TypedefItem(_, _)
30+
| OpaqueTyItem(_)
31+
| StaticItem(_)
32+
| ConstantItem(_)
33+
| TraitAliasItem(_)
34+
| TyMethodItem(_)
35+
| MethodItem(_, _)
36+
| StructFieldItem(_)
37+
| ForeignFunctionItem(_)
38+
| ForeignStaticItem(_)
39+
| ForeignTypeItem
40+
| MacroItem(_)
41+
| ProcMacroItem(_)
42+
| PrimitiveItem(_)
43+
| AssocConstItem(_, _)
44+
| AssocTypeItem(_, _)
45+
| KeywordItem(_) => {}
2846
}
2947
}
3048

0 commit comments

Comments
 (0)