Skip to content

Commit e573381

Browse files
Move RegionTarget and RegionDeps where they into clean/auto_trait
1 parent 8749550 commit e573381

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

src/librustdoc/clean/auto_trait.rs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
use rustc::hir;
22
use rustc::traits::auto_trait::{self, AutoTraitResult};
3-
use rustc::ty::{self, TypeFoldable};
3+
use rustc::ty::{self, Region, RegionVid, TypeFoldable};
4+
use rustc::util::nodemap::FxHashSet;
5+
46
use std::fmt::Debug;
57

68
use super::*;
79

10+
#[derive(Eq, PartialEq, Hash, Copy, Clone, Debug)]
11+
enum RegionTarget<'tcx> {
12+
Region(Region<'tcx>),
13+
RegionVid(RegionVid)
14+
}
15+
16+
#[derive(Default, Debug, Clone)]
17+
struct RegionDeps<'tcx> {
18+
larger: FxHashSet<RegionTarget<'tcx>>,
19+
smaller: FxHashSet<RegionTarget<'tcx>>
20+
}
21+
822
pub struct AutoTraitFinder<'a, 'tcx> {
923
pub cx: &'a core::DocContext<'tcx>,
1024
pub f: auto_trait::AutoTraitFinder<'tcx>,

src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use rustc::hir::def::{CtorKind, DefKind, Res};
2323
use rustc::hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
2424
use rustc::hir::ptr::P;
2525
use rustc::ty::subst::InternalSubsts;
26-
use rustc::ty::{self, TyCtxt, Region, RegionVid, Ty, AdtKind};
26+
use rustc::ty::{self, TyCtxt, Ty, AdtKind};
2727
use rustc::ty::fold::TypeFolder;
2828
use rustc::util::nodemap::{FxHashMap, FxHashSet};
2929
use syntax::ast::{self, Ident};
@@ -2427,18 +2427,6 @@ impl Clean<TypeBindingKind> for hir::TypeBindingKind {
24272427
}
24282428
}
24292429

2430-
#[derive(Eq, PartialEq, Hash, Copy, Clone, Debug)]
2431-
enum RegionTarget<'tcx> {
2432-
Region(Region<'tcx>),
2433-
RegionVid(RegionVid)
2434-
}
2435-
2436-
#[derive(Default, Debug, Clone)]
2437-
struct RegionDeps<'tcx> {
2438-
larger: FxHashSet<RegionTarget<'tcx>>,
2439-
smaller: FxHashSet<RegionTarget<'tcx>>
2440-
}
2441-
24422430
enum SimpleBound {
24432431
TraitBound(Vec<PathSegment>, Vec<SimpleBound>, Vec<GenericParamDef>, hir::TraitBoundModifier),
24442432
Outlives(Lifetime),

0 commit comments

Comments
 (0)