Skip to content

Commit 9576141

Browse files
committedFeb 21, 2016
rustbuild: Sync some Cargo.toml/lib.rs dependencies
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.
1 parent 28a3e8b commit 9576141

File tree

12 files changed

+20
-22
lines changed

12 files changed

+20
-22
lines changed
 

‎src/librustc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ graphviz = { path = "../libgraphviz" }
1717
log = { path = "../liblog" }
1818
rbml = { path = "../librbml" }
1919
rustc_back = { path = "../librustc_back" }
20+
rustc_bitflags = { path = "../librustc_bitflags" }
2021
rustc_data_structures = { path = "../librustc_data_structures" }
2122
rustc_front = { path = "../librustc_front" }
2223
rustc_llvm = { path = "../librustc_llvm" }

‎src/librustc_bitflags/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ version = "0.0.0"
77
name = "rustc_bitflags"
88
path = "lib.rs"
99
test = false
10-
11-
[dependencies]
12-
core = { path = "../libcore" }

‎src/librustc_front/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ crate-type = ["dylib"]
1212
log = { path = "../liblog" }
1313
syntax = { path = "../libsyntax" }
1414
serialize = { path = "../libserialize" }
15+
rustc_bitflags = { path = "../librustc_bitflags" }

‎src/librustc_llvm/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ crate-type = ["dylib"]
1212
[features]
1313
static-libstdcpp = []
1414

15+
[dependencies]
16+
rustc_bitflags = { path = "../librustc_bitflags" }
17+
1518
[build-dependencies]
1619
build_helper = { path = "../build_helper" }
1720
gcc = "0.3"

‎src/librustc_metadata/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ log = { path = "../liblog" }
1414
rbml = { path = "../librbml" }
1515
rustc = { path = "../librustc" }
1616
rustc_back = { path = "../librustc_back" }
17+
rustc_bitflags = { path = "../librustc_bitflags" }
1718
rustc_front = { path = "../librustc_front" }
1819
rustc_llvm = { path = "../librustc_llvm" }
1920
serialize = { path = "../libserialize" }

‎src/librustc_plugin/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ crate-type = ["dylib"]
1111
[dependencies]
1212
log = { path = "../liblog" }
1313
rustc = { path = "../librustc" }
14+
rustc_bitflags = { path = "../librustc_bitflags" }
1415
rustc_front = { path = "../librustc_front" }
1516
rustc_metadata = { path = "../librustc_metadata" }
1617
rustc_mir = { path = "../librustc_mir" }

‎src/librustc_resolve/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ crate-type = ["dylib"]
1212
log = { path = "../liblog" }
1313
syntax = { path = "../libsyntax" }
1414
rustc = { path = "../librustc" }
15+
rustc_bitflags = { path = "../librustc_bitflags" }
1516
rustc_front = { path = "../librustc_front" }
1617
arena = { path = "../libarena" }

‎src/libstd/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ collections = { path = "../libcollections" }
1818
core = { path = "../libcore" }
1919
libc = { path = "../rustc/libc_shim" }
2020
rand = { path = "../librand" }
21-
rustc_bitflags = { path = "../librustc_bitflags" }
2221
rustc_unicode = { path = "../librustc_unicode" }
2322

2423
[build-dependencies]

‎src/libsyntax/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ path = "lib.rs"
99
crate-type = ["dylib"]
1010

1111
[dependencies]
12-
arena = { path = "../libarena" }
13-
fmt_macros = { path = "../libfmt_macros" }
1412
serialize = { path = "../libserialize" }
1513
term = { path = "../libterm" }
1614
log = { path = "../liblog" }
15+
rustc_bitflags = { path = "../librustc_bitflags" }

‎src/libterm/Cargo.toml

-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ version = "0.0.0"
77
name = "term"
88
path = "lib.rs"
99
crate-type = ["dylib", "rlib"]
10-
11-
[dependencies]
12-
log = { path = "../liblog" }

‎src/rustc/Cargo.lock

+11-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/rustc/std_shim/Cargo.lock

-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.