Auto merge of #31811 - alexcrichton:clean-deps, r=sanxiyn

The standard library doesn't depend on rustc_bitflags, so move it to explicit dependencies on all other crates. Additionally, the arena/fmt_macros deps could be dropped from libsyntax.
rust-lang · Feb 22, 2016 · e628398 · e628398
2 parents 19437bd + 9576141
commit e628398
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 22 deletions.
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
@@ -17,6 +17,7 @@ graphviz = { path = "../libgraphviz" }
 log = { path = "../liblog" }
 rbml = { path = "../librbml" }
 rustc_back = { path = "../librustc_back" }
+rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }

diff --git a/src/librustc_bitflags/Cargo.toml b/src/librustc_bitflags/Cargo.toml
@@ -7,6 +7,3 @@ version = "0.0.0"
 name = "rustc_bitflags"
 path = "lib.rs"
 test = false
-
-[dependencies]
-core = { path = "../libcore" }
diff --git a/src/librustc_front/Cargo.toml b/src/librustc_front/Cargo.toml
@@ -12,3 +12,4 @@ crate-type = ["dylib"]
 log = { path = "../liblog" }
 syntax = { path = "../libsyntax" }
 serialize = { path = "../libserialize" }
+rustc_bitflags = { path = "../librustc_bitflags" }
diff --git a/src/librustc_llvm/Cargo.toml b/src/librustc_llvm/Cargo.toml
@@ -12,6 +12,9 @@ crate-type = ["dylib"]
 [features]
 static-libstdcpp = []
 
+[dependencies]
+rustc_bitflags = { path = "../librustc_bitflags" }
+
 [build-dependencies]
 build_helper = { path = "../build_helper" }
 gcc = "0.3"
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
@@ -14,6 +14,7 @@ log = { path = "../liblog" }
 rbml = { path = "../librbml" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
+rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 rustc_llvm = { path = "../librustc_llvm" }
 serialize = { path = "../libserialize" }

diff --git a/src/librustc_plugin/Cargo.toml b/src/librustc_plugin/Cargo.toml
@@ -11,6 +11,7 @@ crate-type = ["dylib"]
 [dependencies]
 log = { path = "../liblog" }
 rustc = { path = "../librustc" }
+rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_mir = { path = "../librustc_mir" }

diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml
@@ -12,5 +12,6 @@ crate-type = ["dylib"]
 log = { path = "../liblog" }
 syntax = { path = "../libsyntax" }
 rustc = { path = "../librustc" }
+rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_front = { path = "../librustc_front" }
 arena = { path = "../libarena" }
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
@@ -18,7 +18,6 @@ collections = { path = "../libcollections" }
 core = { path = "../libcore" }
 libc = { path = "../rustc/libc_shim" }
 rand = { path = "../librand" }
-rustc_bitflags = { path = "../librustc_bitflags" }
 rustc_unicode = { path = "../librustc_unicode" }
 
 [build-dependencies]

diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml
@@ -9,8 +9,7 @@ path = "lib.rs"
 crate-type = ["dylib"]
 
 [dependencies]
-arena = { path = "../libarena" }
-fmt_macros = { path = "../libfmt_macros" }
 serialize = { path = "../libserialize" }
 term = { path = "../libterm" }
 log = { path = "../liblog" }
+rustc_bitflags = { path = "../librustc_bitflags" }
diff --git a/src/libterm/Cargo.toml b/src/libterm/Cargo.toml
@@ -7,6 +7,3 @@ version = "0.0.0"
 name = "term"
 path = "lib.rs"
 crate-type = ["dylib", "rlib"]
-
-[dependencies]
-log = { path = "../liblog" }
diff --git a/src/rustc/Cargo.lock b/src/rustc/Cargo.lock
diff --git a/src/rustc/std_shim/Cargo.lock b/src/rustc/std_shim/Cargo.lock