Skip to content

Commit ce3d1a6

Browse files
committed
Auto merge of #1548 - RalfJung:update, r=RalfJung
Update dependencies
2 parents ce29fbf + 6be8761 commit ce3d1a6

File tree

13 files changed

+165
-148
lines changed

13 files changed

+165
-148
lines changed

Cargo.lock

Lines changed: 81 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ doctest = false # and no doc tests
2424
required-features = ["rustc_tests"]
2525

2626
[dependencies]
27-
getrandom = { version = "0.1.8", features = ["std"] }
27+
getrandom = { version = "0.2", features = ["std"] }
2828
env_logger = "0.7.1"
2929
log = "0.4"
3030
shell-escape = "0.1.4"
@@ -44,7 +44,7 @@ libc = "0.2"
4444
[dev-dependencies]
4545
compiletest_rs = { version = "0.5", features = ["tmp"] }
4646
rustc_version = "0.2.3"
47-
colored = "1.6"
47+
colored = "2"
4848

4949
[features]
5050
rustc_tests = []

cargo-miri/Cargo.lock

Lines changed: 54 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cargo-miri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test = false # we have no unit tests
1414
doctest = false # and no doc tests
1515

1616
[dependencies]
17-
directories = "2.0"
17+
directories = "3"
1818
rustc_version = "0.2.3"
1919
serde_json = "1.0.40"
2020

test-cargo-miri/Cargo.lock

Lines changed: 13 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-cargo-miri/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ byteorder = "1.0"
1212

1313
[dev-dependencies]
1414
rand = { version = "0.7", features = ["small_rng"] }
15-
num_cpus = "1.10.1"
1615

1716
[lib]
1817
test = false # test that this is respected (will show in the output)

test-cargo-miri/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fn main() {
1919
}
2020

2121
// If there were no arguments, access stdin and test working dir.
22+
// (We rely on the test runner to always disable isolation when passing no arguments.)
2223
if std::env::args().len() <= 1 {
2324
// CWD should be crate root.
2425
// We have to normalize slashes, as the env var might be set for a different target's conventions.
@@ -33,7 +34,7 @@ fn main() {
3334
let num: i32 = line.unwrap().parse().unwrap();
3435
println!("{}", 2*num);
3536
}
36-
// On non-Unix, reading from stdin is not support. So we hard-code the right answer.
37+
// On non-Unix, reading from stdin is not supported. So we hard-code the right answer.
3738
#[cfg(not(unix))]
3839
{
3940
println!("24");

0 commit comments

Comments
 (0)