From 796bc2f4f9ec7f7e03c803cd2db991d7c4364691 Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Tue, 22 Nov 2022 16:26:28 +0100 Subject: [PATCH] Upgraded compiletest_rs to 0.9.0 --- Cargo.lock | 9 +++++---- Cargo.toml | 8 +------- tests/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2031ac73ed..2c9ad1066a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,8 +322,9 @@ dependencies = [ [[package]] name = "compiletest_rs" -version = "0.7.1" -source = "git+https://github.com/Manishearth/compiletest-rs.git?rev=4ab843a1dc6ed9a82657d86d22397c6c5bb95b01#4ab843a1dc6ed9a82657d86d22397c6c5bb95b01" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70489bbb718aea4f92e5f48f2e3b5be670c2051de30e57cb6e5377b4aa08b372" dependencies = [ "diff", "filetime", @@ -2028,9 +2029,9 @@ dependencies = [ [[package]] name = "rustfix" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2c50b74badcddeb8f7652fa8323ce440b95286f8e4b64ebfd871c609672704e" +checksum = "ecd2853d9e26988467753bd9912c3a126f642d05d229a4b53f5752ee36c56481" dependencies = [ "anyhow", "log", diff --git a/Cargo.toml b/Cargo.toml index 6ff048bdf0..06579b2fde 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,10 +51,4 @@ codegen-units = 256 [profile.release.build-override] opt-level = 3 incremental = true -codegen-units = 256 - -[patch.crates-io] -# HACK(eddyb) needed to include this PR (until it's part of a release): -# * Manishearth/compiletest-rs#249 (for `// only-*` support) -# [shesp] The commit is part of 0.8 release. We can remove this once we upgrade `compiletest`. -compiletest_rs = { git = "https://github.com/Manishearth/compiletest-rs.git", rev = "4ab843a1dc6ed9a82657d86d22397c6c5bb95b01" } +codegen-units = 256 \ No newline at end of file diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 46f8c14b6c..11bcc71c88 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -14,6 +14,6 @@ use-installed-tools = ["rustc_codegen_spirv/use-installed-tools"] use-compiled-tools = ["rustc_codegen_spirv/use-compiled-tools"] [dependencies] -compiletest = { version = "0.7.0", package = "compiletest_rs" } +compiletest = { version = "0.9.0", package = "compiletest_rs" } rustc_codegen_spirv.workspace = true structopt = "0.3.21"