Skip to content

Commit a30fa08

Browse files
committed
Remove trival impl Clean for CrateNum
1 parent e32ecee commit a30fa08

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

src/librustdoc/clean/mod.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use rustc_attr as attr;
1414
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1515
use rustc_hir as hir;
1616
use rustc_hir::def::{CtorKind, DefKind, Res};
17-
use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
17+
use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
1818
use rustc_index::vec::{Idx, IndexVec};
1919
use rustc_infer::infer::region_constraints::{Constraint, RegionConstraintData};
2020
use rustc_middle::middle::resolve_lifetime as rl;
@@ -85,12 +85,6 @@ impl<T: Clean<U>, U> Clean<Option<U>> for Option<T> {
8585
}
8686
}
8787

88-
impl Clean<ExternalCrate> for CrateNum {
89-
fn clean(&self, _cx: &mut DocContext<'_>) -> ExternalCrate {
90-
ExternalCrate { crate_num: *self }
91-
}
92-
}
93-
9488
impl Clean<Item> for doctree::Module<'_> {
9589
fn clean(&self, cx: &mut DocContext<'_>) -> Item {
9690
let mut items: Vec<Item> = vec![];

src/librustdoc/clean/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ crate struct TraitWithExtraInfo {
133133
crate is_notable: bool,
134134
}
135135

136-
#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
136+
#[derive(Copy, Clone, Debug)]
137137
crate struct ExternalCrate {
138138
crate crate_num: CrateNum,
139139
}

src/librustdoc/clean/utils.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate {
3939
// Analyze doc-reachability for extern items
4040
LibEmbargoVisitor::new(cx).visit_lib(cnum);
4141
}
42-
externs.sort_unstable();
42+
externs.sort_unstable_by_key(|e| e.crate_num);
4343

4444
// Clean the crate, translating the entire librustc_ast AST to one that is
4545
// understood by rustdoc.
@@ -61,7 +61,7 @@ crate fn krate(cx: &mut DocContext<'_>) -> Crate {
6161
_ => unreachable!(),
6262
}
6363

64-
let local_crate = LOCAL_CRATE.clean(cx);
64+
let local_crate = ExternalCrate { crate_num: LOCAL_CRATE };
6565
let src = local_crate.src(cx.tcx);
6666
let name = local_crate.name(cx.tcx);
6767
let primitives = local_crate.primitives(cx.tcx);

0 commit comments

Comments
 (0)