From 788950e5c5a426a1ef986e9716d4a071007ad7c0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 17 Jun 2019 17:32:41 -0600
Subject: [PATCH] Downgrade libtest
---
Cargo.lock | 16 +++++++++++-----
src/libtest/Cargo.toml | 2 +-
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 277de9134f56..8d1e83537b11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1320,11 +1320,11 @@ dependencies = [
[[package]]
name = "libtest"
-version = "0.0.2"
-source = "git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox#d24811d69df568eed581da868d53fa0416df1f3c"
+version = "0.0.1"
+source = "git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1#434706efe491bf5bfe8b74bf00a81d5950a8325c"
dependencies = [
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_term 0.0.1 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1)",
]
[[package]]
@@ -2951,6 +2951,11 @@ dependencies = [
"serialize 0.0.0",
]
+[[package]]
+name = "rustc_term"
+version = "0.0.1"
+source = "git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1#434706efe491bf5bfe8b74bf00a81d5950a8325c"
+
[[package]]
name = "rustc_tools_util"
version = "0.1.1"
@@ -3473,7 +3478,7 @@ dependencies = [
name = "test"
version = "0.0.0"
dependencies = [
- "libtest 0.0.2 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox)",
+ "libtest 0.0.1 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1)",
"proc_macro 0.0.0",
]
@@ -4106,7 +4111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum libgit2-sys 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)" = "48441cb35dc255da8ae72825689a95368bf510659ae1ad55dc4aa88cb1789bf1"
"checksum libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d75d7966bda4730b722d1eab8e668df445368a24394bae9fc1e8dc0ab3dbe4f4"
"checksum libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
-"checksum libtest 0.0.2 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox)" = "<none>"
+"checksum libtest 0.0.1 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1)" = "<none>"
"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
@@ -4215,6 +4220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rustc-rayon 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d98c51d9cbbe810c8b6693236d3412d8cd60513ff27a3e1b6af483dca0af544"
"checksum rustc-rayon-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "526e7b6d2707a5b9bec3927d424ad70fa3cfc68e0ac1b75e46cdbbc95adc5108"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+"checksum rustc_term 0.0.1 (git+https://gitlab.redox-os.org/redox-os/libtest?branch=redox-0.0.1)" = "<none>"
"checksum rustc_tools_util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c5a95edfa0c893236ae4778bb7c4752760e4c0d245e19b5eff33c5aa5eb9dc"
"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
"checksum rustfix 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "af7c21531a91512a4a51b490be6ba1c8eff34fdda0dc5bf87dc28d86748aac56"
diff --git a/src/libtest/Cargo.toml b/src/libtest/Cargo.toml
index ee7eecb850b4..a5fed0f4d382 100644
--- a/src/libtest/Cargo.toml
+++ b/src/libtest/Cargo.toml
@@ -10,7 +10,7 @@ path = "lib.rs"
crate-type = ["dylib", "rlib"]
[dependencies]
-libtest = { git = "https://gitlab.redox-os.org/redox-os/libtest", branch = "redox" }
+libtest = { git = "https://gitlab.redox-os.org/redox-os/libtest", branch = "redox-0.0.1" }
# not actually used but needed to always have proc_macro in the sysroot
proc_macro = { path = "../libproc_macro" }
--
GitLab