user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #994 - RalfJung:rustup, r=RalfJung

Browse source 
Fix for rustc and compiletest changes

Let's see if just bumping the rustc version is enough...
This commit is contained in:
bors 2019-10-14 11:17:57 +00:00
commit b0bfe9e89f
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -158,7 +158,7 @@ dependencies = [
[[package]]
name = "compiletest_rs"
version = "0.3.23"
version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -338,7 +338,7 @@ dependencies = [
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"compiletest_rs 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)",
"compiletest_rs 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
"directories 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
"getrandom 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -822,7 +822,7 @@ dependencies = [
"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cdb90b60f2927f8d76139c72dbde7e10c3a2bc47c8594c9c7a66529f2687c03"
"checksum compiletest_rs 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "eb783fe7afb90ec3d3e49ccaf9196d29ab63c6ed61d4b0695839daa580ae3a3d"
"checksum compiletest_rs 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "676a74b493d50ac33cacd83fd536597e6b52c0b46b9856f7b9c809d82fef4ac0"
"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
"checksum diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a"

2
Cargo.toml
View file

@ -59,5 +59,5 @@ cargo_miri = ["cargo_metadata", "directories", "rustc_version"]
rustc_tests = []
[dev-dependencies]
compiletest_rs = { version = "0.3.23", features = ["tmp"] }
compiletest_rs = { version = "0.3.24", features = ["tmp"] }
colored = "1.6"

2
rust-version
View file

@ -1 +1 @@
898f36c83cc28d7921a1d7b3605323dc5cfcf533
d28a9c38fe14396e86ae274c7847e20ee0f78ca9