Skip to content

Commit

Permalink
rebase over the hir rename
Browse files Browse the repository at this point in the history
  • Loading branch information
nikomatsakis committed Apr 6, 2016
1 parent ec47b59 commit 22b4bb0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/librustc/dep_graph/visit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use hir;
use hir::def_id::DefId;
use hir::intravisit::Visitor;
use ty::TyCtxt;
use rustc_front::hir;
use rustc_front::intravisit::Visitor;

use super::dep_node::DepNode;

Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/cstore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ use hir::def::{self, Def};
use middle::lang_items;
use ty::{self, Ty, TyCtxt, VariantKind};
use hir::def_id::{DefId, DefIndex};
use hir::svh::Svh;
use mir::repr::Mir;
use mir::mir_map::MirMap;
use session::Session;
Expand Down
10 changes: 5 additions & 5 deletions src/librustc_incremental/calculate_svh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::hash::{Hash, SipHasher, Hasher};
use rustc::hir::def_id::{CRATE_DEF_INDEX, DefId};
use rustc::hir::svh::Svh;
use rustc::ty;
use rustc_front::intravisit::{self, Visitor};
use rustc::hir::intravisit::{self, Visitor};

use self::svh_visitor::StrictVersionHashVisitor;

Expand Down Expand Up @@ -110,10 +110,10 @@ mod svh_visitor {
use syntax::codemap::Span;
use syntax::parse::token;
use rustc::ty;
use rustc_front::intravisit as visit;
use rustc_front::intravisit::{Visitor, FnKind};
use rustc_front::hir::*;
use rustc_front::hir;
use rustc::hir;
use rustc::hir::*;
use rustc::hir::intravisit as visit;
use rustc::hir::intravisit::{Visitor, FnKind};

use std::hash::{Hash, SipHasher};

Expand Down
4 changes: 2 additions & 2 deletions src/librustc_incremental/persist/directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//! item might even be removed in the meantime).

use rustc::dep_graph::DepNode;
use rustc::front::map::DefPath;
use rustc::middle::def_id::DefId;
use rustc::hir::map::DefPath;
use rustc::hir::def_id::DefId;
use rustc::ty;
use rustc::util::nodemap::DefIdMap;
use rustc_serialize::{Decoder as RustcDecoder,
Expand Down
6 changes: 3 additions & 3 deletions src/librustc_incremental/persist/dirty_clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
//! the required condition is not met.

use rustc::dep_graph::{DepGraphQuery, DepNode};
use rustc::middle::def_id::DefId;
use rustc_front::hir;
use rustc_front::intravisit::Visitor;
use rustc::hir;
use rustc::hir::def_id::DefId;
use rustc::hir::intravisit::Visitor;
use syntax::ast::{self, Attribute, MetaItem};
use syntax::attr::AttrMetaMethods;
use syntax::parse::token::InternedString;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/persist/load.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use calculate_svh::SvhCalculate;
use rbml::Error;
use rbml::opaque::Decoder;
use rustc::dep_graph::DepNode;
use rustc::middle::def_id::DefId;
use rustc::hir::def_id::DefId;
use rustc::ty;
use rustc_data_structures::fnv::FnvHashSet;
use rustc_serialize::Decodable as RustcDecodable;
Expand Down
2 changes: 0 additions & 2 deletions src/librustc_trans/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ use syntax::ast;
use syntax::codemap::Span;
use syntax::attr::AttrMetaMethods;

use rustc::hir;

// RLIB LLVM-BYTECODE OBJECT LAYOUT
// Version 1
// Bytes Data
Expand Down

0 comments on commit 22b4bb0

Please sign in to comment.