diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-03-17 06:54:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-17 06:54:27 +0000 |
| commit | 3bff42fd142b85d623c2e58e3eeb4335139599c9 (patch) | |
| tree | 83458c4a517305810cde7813d7c5db9505a794cb | |
| parent | b3cfa1986b559d4f74bf2709532c1401ebbdd759 (diff) | |
| parent | be6d5001e49f85aadb41ee9bb1578d3ebcda3ad7 (diff) | |
| download | rust-3bff42fd142b85d623c2e58e3eeb4335139599c9.tar.gz rust-3bff42fd142b85d623c2e58e3eeb4335139599c9.zip | |
Merge #11734
11734: internal: Bump `xshell` and fix `dist` r=lnicola a=lnicola bors r+ Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | crates/ide_db/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/sourcegen/Cargo.toml | 2 | ||||
| -rw-r--r-- | xtask/Cargo.toml | 2 | ||||
| -rw-r--r-- | xtask/src/metrics.rs | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Cargo.lock b/Cargo.lock index fab0edfe305..416ab4e3e64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2072,18 +2072,18 @@ checksum = "da260301476ad19a4733a0e930db8227a48ea04561e235a5102978145ec69fcc" [[package]] name = "xshell" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3332cab90be2998a2aacb6494db45344bd16dfcc43ff36c42255018c6bcc96be" +checksum = "4884417669886d3abff14feec797179526ade713f212e54ec08b19bc6bdc86aa" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47e54cffa76000b7641328ab3bb1e146f93a1690ab86c5909c656f49d91019c" +checksum = "37d92065701c3611323f96eac5475b995421fc7eb2bcba1336cdd80b9b2fb68f" [[package]] name = "xtask" diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml index c71a213c409..26b51739cf6 100644 --- a/crates/ide_db/Cargo.toml +++ b/crates/ide_db/Cargo.toml @@ -35,5 +35,5 @@ limit = { path = "../limit", version = "0.0.0" } [dev-dependencies] test_utils = { path = "../test_utils" } sourcegen = { path = "../sourcegen" } -xshell = "0.2.0" +xshell = "0.2.1" expect-test = "1.2.0-pre.1" diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 68d728b41f5..079e56c9fad 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -75,7 +75,7 @@ jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = tr [dev-dependencies] expect-test = "1.2.0-pre.1" jod-thread = "0.1.0" -xshell = "0.2.0" +xshell = "0.2.1" test_utils = { path = "../test_utils" } sourcegen = { path = "../sourcegen" } diff --git a/crates/sourcegen/Cargo.toml b/crates/sourcegen/Cargo.toml index 10587d913db..57e183af3f3 100644 --- a/crates/sourcegen/Cargo.toml +++ b/crates/sourcegen/Cargo.toml @@ -10,4 +10,4 @@ rust-version = "1.57" doctest = false [dependencies] -xshell = "0.2.0" +xshell = "0.2.1" diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index d9adf88c027..de6a102427c 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -10,6 +10,6 @@ rust-version = "1.57" anyhow = "1.0.26" flate2 = "1.0" write-json = "0.1.0" -xshell = "0.2.0" +xshell = "0.2.1" xflags = "0.2.1" # Avoid adding more dependencies to this crate diff --git a/xtask/src/metrics.rs b/xtask/src/metrics.rs index 27dae5a4498..3da7419582a 100644 --- a/xtask/src/metrics.rs +++ b/xtask/src/metrics.rs @@ -17,7 +17,7 @@ impl flags::Metrics { pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> { let mut metrics = Metrics::new(sh)?; if !self.dry_run { - let _ = sh.remove_path("./target/release"); + sh.remove_path("./target/release")?; } if !Path::new("./target/rustc-perf").exists() { sh.create_dir("./target/rustc-perf")?; |