about summary refs log tree commit diff
path: root/src/librustc_metadata
diff options
context:
space:
mode:
authorJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2017-12-03 13:49:01 +0100
committerJohn Kåre Alsaker <john.kare.alsaker@gmail.com>2017-12-17 14:14:51 +0100
commit970c613e4a785325469d4f694a16505d5deac17a (patch)
treea3f3a22dfff0f3578a7530805eb275205483ac68 /src/librustc_metadata
parent53a6d14e5bb8b1915a5f0b9371bbf0da934ed052 (diff)
downloadrust-970c613e4a785325469d4f694a16505d5deac17a.tar.gz
rust-970c613e4a785325469d4f694a16505d5deac17a.zip
Add sync module to rustc_data_structures
Diffstat (limited to 'src/librustc_metadata')
-rw-r--r--src/librustc_metadata/Cargo.toml1
-rw-r--r--src/librustc_metadata/cstore.rs2
-rw-r--r--src/librustc_metadata/lib.rs1
-rw-r--r--src/librustc_metadata/locator.rs2
4 files changed, 2 insertions, 4 deletions
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
index 40b75be36fe..3d61bc102e2 100644
--- a/src/librustc_metadata/Cargo.toml
+++ b/src/librustc_metadata/Cargo.toml
@@ -11,7 +11,6 @@ crate-type = ["dylib"]
 [dependencies]
 flate2 = "0.2"
 log = "0.3"
-owning_ref = "0.3.3"
 proc_macro = { path = "../libproc_macro" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
diff --git a/src/librustc_metadata/cstore.rs b/src/librustc_metadata/cstore.rs
index 3a4ba6768a7..87e41cae60d 100644
--- a/src/librustc_metadata/cstore.rs
+++ b/src/librustc_metadata/cstore.rs
@@ -24,7 +24,7 @@ use rustc::util::nodemap::{FxHashMap, FxHashSet, NodeMap};
 
 use std::cell::{RefCell, Cell};
 use std::rc::Rc;
-use owning_ref::ErasedBoxRef;
+use rustc_data_structures::owning_ref::ErasedBoxRef;
 use syntax::{ast, attr};
 use syntax::ext::base::SyntaxExtension;
 use syntax::symbol::Symbol;
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index 6c1ca362323..a65ddcecf88 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -31,7 +31,6 @@ extern crate syntax;
 extern crate syntax_pos;
 extern crate flate2;
 extern crate serialize as rustc_serialize; // used by deriving
-extern crate owning_ref;
 extern crate rustc_errors as errors;
 extern crate syntax_ext;
 extern crate proc_macro;
diff --git a/src/librustc_metadata/locator.rs b/src/librustc_metadata/locator.rs
index 8abccb503d6..90c469eea84 100644
--- a/src/librustc_metadata/locator.rs
+++ b/src/librustc_metadata/locator.rs
@@ -243,7 +243,7 @@ use std::path::{Path, PathBuf};
 use std::time::Instant;
 
 use flate2::read::DeflateDecoder;
-use owning_ref::{ErasedBoxRef, OwningRef};
+use rustc_data_structures::owning_ref::{ErasedBoxRef, OwningRef};
 
 pub struct CrateMismatch {
     path: PathBuf,