Skip to content

Commit 3eb4890

Browse files
committed
Auto merge of #57842 - gnzlbg:extract_libtest, r=gnzlbg
Move libtest out of rust-lang/rust This is a first step towards a number of goals explained in this internals post: https://internals.rust-lang.org/t/a-path-forward-towards-re-usable-libtest-functionality-custom-test-frameworks-and-a-stable-bench-macro This PR does not fully remove libtest from rust-lang/rust, we keep a shim that imports and re-exports the external libtest, and adds the proc_macro dependency, etc. r? @alexcrichton cc @djrenren @petrochenkov
2 parents 7a4df3b + 1446b24 commit 3eb4890

File tree

17 files changed

+42
-5618
lines changed

17 files changed

+42
-5618
lines changed

Cargo.lock

+17-6
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,15 @@ dependencies = [
12981298
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
12991299
]
13001300

1301+
[[package]]
1302+
name = "libtest"
1303+
version = "0.0.1"
1304+
source = "registry+https://github.com/rust-lang/crates.io-index"
1305+
dependencies = [
1306+
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
1307+
"rustc_term 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1308+
]
1309+
13011310
[[package]]
13021311
name = "libz-sys"
13031312
version = "1.0.25"
@@ -2939,6 +2948,11 @@ dependencies = [
29392948
"serialize 0.0.0",
29402949
]
29412950

2951+
[[package]]
2952+
name = "rustc_term"
2953+
version = "0.0.1"
2954+
source = "registry+https://github.com/rust-lang/crates.io-index"
2955+
29422956
[[package]]
29432957
name = "rustc_tools_util"
29442958
version = "0.1.1"
@@ -3421,10 +3435,6 @@ dependencies = [
34213435
"utf-8 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
34223436
]
34233437

3424-
[[package]]
3425-
name = "term"
3426-
version = "0.0.0"
3427-
34283438
[[package]]
34293439
name = "term"
34303440
version = "0.4.6"
@@ -3465,9 +3475,8 @@ dependencies = [
34653475
name = "test"
34663476
version = "0.0.0"
34673477
dependencies = [
3468-
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
3478+
"libtest 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
34693479
"proc_macro 0.0.0",
3470-
"term 0.0.0",
34713480
]
34723481

34733482
[[package]]
@@ -4089,6 +4098,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40894098
"checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1"
40904099
"checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4"
40914100
"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
4101+
"checksum libtest 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a51ac59582b915cdfc426dada72c6d9eba95818a6b481ca340f5c7152166837"
40924102
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
40934103
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
40944104
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
@@ -4199,6 +4209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
41994209
"checksum rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d98c51d9cbbe810c8b6693236d3412d8cd60513ff27a3e1b6af483dca0af544"
42004210
"checksum rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "526e7b6d2707a5b9bec3927d424ad70fa3cfc68e0ac1b75e46cdbbc95adc5108"
42014211
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
4212+
"checksum rustc_term 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9c69abe7f181d2ea8d2f7b44a4aa86f4b4a567444bcfcf51ed45ede957fbf064"
42024213
"checksum rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c5a95edfa0c893236ae4778bb7c4752760e4c0d245e19b5eff33c5aa5eb9dc"
42034214
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
42044215
"checksum rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "af7c21531a91512a4a51b490be6ba1c8eff34fdda0dc5bf87dc28d86748aac56"

src/bootstrap/dist.rs

-1
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,6 @@ impl Step for Src {
899899
"src/libstd",
900900
"src/libunwind",
901901
"src/libtest",
902-
"src/libterm",
903902
"src/libprofiler_builtins",
904903
"src/stdsimd",
905904
"src/libproc_macro",

src/libterm/Cargo.toml

-10
This file was deleted.

src/libterm/lib.rs

-201
This file was deleted.

0 commit comments

Comments
 (0)