OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rustbuild: Sync some Cargo.toml/lib.rs dependencies

Browse Source 
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.
This commit is contained in:
Alex Crichton 2016-02-21 09:49:13 -08:00
parent 28a3e8bb51
commit 95761417c3
12 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/librustc/Cargo.toml
View File

@ -17,6 +17,7 @@ graphviz = { path = "../libgraphviz" }
log = { path = "../liblog" } log = { path = "../liblog" }
rbml = { path = "../librbml" } rbml = { path = "../librbml" }
rustc_back = { path = "../librustc_back" } rustc_back = { path = "../librustc_back" }
rustc_bitflags = { path = "../librustc_bitflags" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_front = { path = "../librustc_front" } rustc_front = { path = "../librustc_front" }
rustc_llvm = { path = "../librustc_llvm" } rustc_llvm = { path = "../librustc_llvm" }

3
src/librustc_bitflags/Cargo.toml
View File

@ -7,6 +7,3 @@ version = "0.0.0"
name = "rustc_bitflags" name = "rustc_bitflags"
path = "lib.rs" path = "lib.rs"
test = false test = false
[dependencies]
core = { path = "../libcore" }

1
src/librustc_front/Cargo.toml
View File

@ -12,3 +12,4 @@ crate-type = ["dylib"]
log = { path = "../liblog" } log = { path = "../liblog" }
syntax = { path = "../libsyntax" } syntax = { path = "../libsyntax" }
serialize = { path = "../libserialize" } serialize = { path = "../libserialize" }
rustc_bitflags = { path = "../librustc_bitflags" }

3
src/librustc_llvm/Cargo.toml
View File

@ -12,6 +12,9 @@ crate-type = ["dylib"]
[features] [features]
static-libstdcpp = [] static-libstdcpp = []
[dependencies]
rustc_bitflags = { path = "../librustc_bitflags" }
[build-dependencies] [build-dependencies]
build_helper = { path = "../build_helper" } build_helper = { path = "../build_helper" }
gcc = "0.3" gcc = "0.3"

1
src/librustc_metadata/Cargo.toml
View File

@ -14,6 +14,7 @@ log = { path = "../liblog" }
rbml = { path = "../librbml" } rbml = { path = "../librbml" }
rustc = { path = "../librustc" } rustc = { path = "../librustc" }
rustc_back = { path = "../librustc_back" } rustc_back = { path = "../librustc_back" }
rustc_bitflags = { path = "../librustc_bitflags" }
rustc_front = { path = "../librustc_front" } rustc_front = { path = "../librustc_front" }
rustc_llvm = { path = "../librustc_llvm" } rustc_llvm = { path = "../librustc_llvm" }
serialize = { path = "../libserialize" } serialize = { path = "../libserialize" }

1
src/librustc_plugin/Cargo.toml
View File

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

1
src/librustc_resolve/Cargo.toml
View File

@ -12,5 +12,6 @@ crate-type = ["dylib"]
log = { path = "../liblog" } log = { path = "../liblog" }
syntax = { path = "../libsyntax" } syntax = { path = "../libsyntax" }
rustc = { path = "../librustc" } rustc = { path = "../librustc" }
rustc_bitflags = { path = "../librustc_bitflags" }
rustc_front = { path = "../librustc_front" } rustc_front = { path = "../librustc_front" }
arena = { path = "../libarena" } arena = { path = "../libarena" }

1
src/libstd/Cargo.toml
View File

@ -18,7 +18,6 @@ collections = { path = "../libcollections" }
core = { path = "../libcore" } core = { path = "../libcore" }
libc = { path = "../rustc/libc_shim" } libc = { path = "../rustc/libc_shim" }
rand = { path = "../librand" } rand = { path = "../librand" }
rustc_bitflags = { path = "../librustc_bitflags" }
rustc_unicode = { path = "../librustc_unicode" } rustc_unicode = { path = "../librustc_unicode" }
[build-dependencies] [build-dependencies]

3
src/libsyntax/Cargo.toml
View File

@ -9,8 +9,7 @@ path = "lib.rs"
crate-type = ["dylib"] crate-type = ["dylib"]
[dependencies] [dependencies]
arena = { path = "../libarena" }
fmt_macros = { path = "../libfmt_macros" }
serialize = { path = "../libserialize" } serialize = { path = "../libserialize" }
term = { path = "../libterm" } term = { path = "../libterm" }
log = { path = "../liblog" } log = { path = "../liblog" }
rustc_bitflags = { path = "../librustc_bitflags" }

3
src/libterm/Cargo.toml
View File

@ -7,6 +7,3 @@ version = "0.0.0"
name = "term" name = "term"
path = "lib.rs" path = "lib.rs"
crate-type = ["dylib", "rlib"] crate-type = ["dylib", "rlib"]
[dependencies]
log = { path = "../liblog" }

16
src/rustc/Cargo.lock generated
View File

@ -86,6 +86,7 @@ dependencies = [
"log 0.0.0", "log 0.0.0",
"rbml 0.0.0", "rbml 0.0.0",
"rustc_back 0.0.0", "rustc_back 0.0.0",
"rustc_bitflags 0.0.0",
"rustc_data_structures 0.0.0", "rustc_data_structures 0.0.0",
"rustc_front 0.0.0", "rustc_front 0.0.0",
"rustc_llvm 0.0.0", "rustc_llvm 0.0.0",
@ -104,6 +105,10 @@ dependencies = [
"syntax 0.0.0", "syntax 0.0.0",
] ]
[[package]]
name = "rustc_bitflags"
version = "0.0.0"
[[package]] [[package]]
name = "rustc_borrowck" name = "rustc_borrowck"
version = "0.0.0" version = "0.0.0"
@ -156,6 +161,7 @@ name = "rustc_front"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"log 0.0.0", "log 0.0.0",
"rustc_bitflags 0.0.0",
"serialize 0.0.0", "serialize 0.0.0",
"syntax 0.0.0", "syntax 0.0.0",
] ]
@ -177,6 +183,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"build_helper 0.1.0", "build_helper 0.1.0",
"gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc_bitflags 0.0.0",
] ]
[[package]] [[package]]
@ -188,6 +195,7 @@ dependencies = [
"rbml 0.0.0", "rbml 0.0.0",
"rustc 0.0.0", "rustc 0.0.0",
"rustc_back 0.0.0", "rustc_back 0.0.0",
"rustc_bitflags 0.0.0",
"rustc_front 0.0.0", "rustc_front 0.0.0",
"rustc_llvm 0.0.0", "rustc_llvm 0.0.0",
"serialize 0.0.0", "serialize 0.0.0",
@ -231,6 +239,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"log 0.0.0", "log 0.0.0",
"rustc 0.0.0", "rustc 0.0.0",
"rustc_bitflags 0.0.0",
"rustc_front 0.0.0", "rustc_front 0.0.0",
"rustc_metadata 0.0.0", "rustc_metadata 0.0.0",
"rustc_mir 0.0.0", "rustc_mir 0.0.0",
@ -254,6 +263,7 @@ dependencies = [
"arena 0.0.0", "arena 0.0.0",
"log 0.0.0", "log 0.0.0",
"rustc 0.0.0", "rustc 0.0.0",
"rustc_bitflags 0.0.0",
"rustc_front 0.0.0", "rustc_front 0.0.0",
"syntax 0.0.0", "syntax 0.0.0",
] ]
@ -325,9 +335,8 @@ dependencies = [
name = "syntax" name = "syntax"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena 0.0.0",
"fmt_macros 0.0.0",
"log 0.0.0", "log 0.0.0",
"rustc_bitflags 0.0.0",
"serialize 0.0.0", "serialize 0.0.0",
"term 0.0.0", "term 0.0.0",
] ]
@ -343,9 +352,6 @@ dependencies = [
[[package]] [[package]]
name = "term" name = "term"
version = "0.0.0" version = "0.0.0"
dependencies = [
"log 0.0.0",
]
[[package]] [[package]]
name = "test" name = "test"

8
src/rustc/std_shim/Cargo.lock generated
View File

@ -81,13 +81,6 @@ dependencies = [
"core 0.0.0", "core 0.0.0",
] ]
[[package]]
name = "rustc_bitflags"
version = "0.0.0"
dependencies = [
"core 0.0.0",
]
[[package]] [[package]]
name = "rustc_unicode" name = "rustc_unicode"
version = "0.0.0" version = "0.0.0"
@ -108,7 +101,6 @@ dependencies = [
"gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", "gcc 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.0.0", "libc 0.0.0",
"rand 0.0.0", "rand 0.0.0",
"rustc_bitflags 0.0.0",
"rustc_unicode 0.0.0", "rustc_unicode 0.0.0",
] ]