Skip to content

Commit

Permalink
Auto merge of #1548 - RalfJung:update, r=RalfJung
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
bors committed Sep 18, 2020
2 parents ce29fbf + 6be8761 commit ce3d1a6
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 148 deletions.
152 changes: 81 additions & 71 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ doctest = false # and no doc tests
required-features = ["rustc_tests"]

[dependencies]
getrandom = { version = "0.1.8", features = ["std"] }
getrandom = { version = "0.2", features = ["std"] }
env_logger = "0.7.1"
log = "0.4"
shell-escape = "0.1.4"
Expand All @@ -44,7 +44,7 @@ libc = "0.2"
[dev-dependencies]
compiletest_rs = { version = "0.5", features = ["tmp"] }
rustc_version = "0.2.3"
colored = "1.6"
colored = "2"

[features]
rustc_tests = []
103 changes: 54 additions & 49 deletions cargo-miri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cargo-miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test = false # we have no unit tests
doctest = false # and no doc tests

[dependencies]
directories = "2.0"
directories = "3"
rustc_version = "0.2.3"
serde_json = "1.0.40"

Expand Down
24 changes: 13 additions & 11 deletions test-cargo-miri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion test-cargo-miri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ byteorder = "1.0"

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

[lib]
test = false # test that this is respected (will show in the output)
3 changes: 2 additions & 1 deletion test-cargo-miri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ fn main() {
}

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

0 comments on commit ce3d1a6

Please sign in to comment.