Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 20:43:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #11734

Browse source 
11734: internal: Bump `xshell` and fix `dist` r=lnicola a=lnicola

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2022-03-17 06:54:27 +00:00 committed by GitHub
commit 3bff42fd14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -2072,18 +2072,18 @@ checksum = "da260301476ad19a4733a0e930db8227a48ea04561e235a5102978145ec69fcc"
[[package]] [[package]]
name = "xshell" name = "xshell"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3332cab90be2998a2aacb6494db45344bd16dfcc43ff36c42255018c6bcc96be" checksum = "4884417669886d3abff14feec797179526ade713f212e54ec08b19bc6bdc86aa"
dependencies = [ dependencies = [
"xshell-macros", "xshell-macros",
] ]
[[package]] [[package]]
name = "xshell-macros" name = "xshell-macros"
version = "0.2.0" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f47e54cffa76000b7641328ab3bb1e146f93a1690ab86c5909c656f49d91019c" checksum = "37d92065701c3611323f96eac5475b995421fc7eb2bcba1336cdd80b9b2fb68f"
[[package]] [[package]]
name = "xtask" name = "xtask"

2
crates/ide_db/Cargo.toml
View file

@ -35,5 +35,5 @@ limit = { path = "../limit", version = "0.0.0" }
[dev-dependencies] [dev-dependencies]
test_utils = { path = "../test_utils" } test_utils = { path = "../test_utils" }
sourcegen = { path = "../sourcegen" } sourcegen = { path = "../sourcegen" }
xshell = "0.2.0" xshell = "0.2.1"
expect-test = "1.2.0-pre.1" expect-test = "1.2.0-pre.1"

2
crates/rust-analyzer/Cargo.toml
View file

@ -75,7 +75,7 @@ jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = tr
[dev-dependencies] [dev-dependencies]
expect-test = "1.2.0-pre.1" expect-test = "1.2.0-pre.1"
jod-thread = "0.1.0" jod-thread = "0.1.0"
xshell = "0.2.0" xshell = "0.2.1"
test_utils = { path = "../test_utils" } test_utils = { path = "../test_utils" }
sourcegen = { path = "../sourcegen" } sourcegen = { path = "../sourcegen" }

2
crates/sourcegen/Cargo.toml
View file

@ -10,4 +10,4 @@ rust-version = "1.57"
doctest = false doctest = false
[dependencies] [dependencies]
xshell = "0.2.0" xshell = "0.2.1"

2
xtask/Cargo.toml
View file

@ -10,6 +10,6 @@ rust-version = "1.57"
anyhow = "1.0.26" anyhow = "1.0.26"
flate2 = "1.0" flate2 = "1.0"
write-json = "0.1.0" write-json = "0.1.0"
xshell = "0.2.0" xshell = "0.2.1"
xflags = "0.2.1" xflags = "0.2.1"
# Avoid adding more dependencies to this crate # Avoid adding more dependencies to this crate

2
xtask/src/metrics.rs
View file

@ -17,7 +17,7 @@ impl flags::Metrics {
pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> { pub(crate) fn run(self, sh: &Shell) -> anyhow::Result<()> {
let mut metrics = Metrics::new(sh)?; let mut metrics = Metrics::new(sh)?;
if !self.dry_run { if !self.dry_run {
let _ = sh.remove_path("./target/release"); sh.remove_path("./target/release")?;
} }
if !Path::new("./target/rustc-perf").exists() { if !Path::new("./target/rustc-perf").exists() {
sh.create_dir("./target/rustc-perf")?; sh.create_dir("./target/rustc-perf")?;