Skip to content

Commit a4ebef0

Browse files
committed
Add temporary dependency on git-stacker
1 parent 7da6fc2 commit a4ebef0

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

src/Cargo.lock

+5-11
Original file line numberDiff line numberDiff line change
@@ -815,11 +815,6 @@ dependencies = [
815815
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
816816
]
817817

818-
[[package]]
819-
name = "gcc"
820-
version = "0.3.55"
821-
source = "registry+https://github.com/rust-lang/crates.io-index"
822-
823818
[[package]]
824819
name = "getopts"
825820
version = "0.2.17"
@@ -1909,7 +1904,7 @@ dependencies = [
19091904
"scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
19101905
"serialize 0.0.0",
19111906
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
1912-
"stacker 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1907+
"stacker 0.1.4 (git+https://github.com/oli-obk/stacker.git)",
19131908
"syntax 0.0.0",
19141909
"syntax_pos 0.0.0",
19151910
"tempfile 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2670,11 +2665,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
26702665

26712666
[[package]]
26722667
name = "stacker"
2673-
version = "0.1.3"
2674-
source = "registry+https://github.com/rust-lang/crates.io-index"
2668+
version = "0.1.4"
2669+
source = "git+https://github.com/oli-obk/stacker.git#30b32ea0514bac734539eccd4157e6d8684abcb6"
26752670
dependencies = [
2671+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
26762672
"cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2677-
"gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
26782673
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
26792674
]
26802675

@@ -3246,7 +3241,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32463241
"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
32473242
"checksum futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c"
32483243
"checksum fwdansi 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "34dd4c507af68d37ffef962063dfa1944ce0dd4d5b82043dbab1dabe088610c3"
3249-
"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
32503244
"checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05"
32513245
"checksum git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "591f8be1674b421644b6c030969520bc3fa12114d2eb467471982ed3e9584e71"
32523246
"checksum git2-curl 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0173e317f8ba21f3fff0f71549fead5e42e67961dbd402bf69f42775f3cc78b4"
@@ -3386,7 +3380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33863380
"checksum smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d"
33873381
"checksum socket2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7"
33883382
"checksum stable_deref_trait 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbc596e092fe5f598b12ef46cc03754085ac2f4d8c739ad61c4ae266cc3b3fa"
3389-
"checksum stacker 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "82c150485b78a81ed189dbdd1947397344bc296b86f7fcc7ca3cdae8bfe882e0"
3383+
"checksum stacker 0.1.4 (git+https://github.com/oli-obk/stacker.git)" = "<none>"
33903384
"checksum string_cache 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25d70109977172b127fe834e5449e5ab1740b9ba49fa18a2020f509174f25423"
33913385
"checksum string_cache_codegen 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "35293b05cf1494e8ddd042a7df6756bf18d07f42d234f32e71dce8a7aabb0191"
33923386
"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"

src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ byteorder = { version = "1.1", features = ["i128"]}
3434
chalk-engine = { version = "0.8.0", default-features=false }
3535
rustc_fs_util = { path = "../librustc_fs_util" }
3636
smallvec = { version = "0.6.5", features = ["union"] }
37-
stacker = "0.1.3"
37+
stacker = { git = "https://github.com/oli-obk/stacker.git" }
3838

3939
# Note that these dependencies are a lie, they're just here to get linkage to
4040
# work.

src/tools/tidy/src/extdeps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use std::path::Path;
1717
/// List of whitelisted sources for packages
1818
const WHITELISTED_SOURCES: &[&str] = &[
1919
"\"registry+https://github.com/rust-lang/crates.io-index\"",
20+
"\"git+https://github.com/oli-obk/stacker.git#30b32ea0514bac734539eccd4157e6d8684abcb6\"",
2021
];
2122

2223
/// check for external package sources

0 commit comments

Comments
 (0)