Auto merge of #66874 - RalfJung:miri-assert-panic, r=oli-obk

[rust.git] / Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index 6e152e96070d30374fc47c54e5c2996f1056498f..67259aed8ebeece2b94f743cfb7649b50a1baa5e 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -466,7 +466,7 @@ dependencies = [
  "cargo_metadata 0.9.0",
  "clippy-mini-macro-test",
  "clippy_lints",
- "compiletest_rs 0.4.0",
+ "compiletest_rs",
  "derive-new",
  "lazy_static 1.3.0",
  "regex",
@@ -474,7 +474,7 @@ dependencies = [
  "rustc_tools_util 0.2.0",
  "semver",
  "serde",
- "tester 0.7.0",
+ "tester",
 ]
 
 [[package]]
@@ -595,28 +595,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "compiletest_rs"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d8975604ebad8b6660796802377eb6495045c5606168fc1b8d19a4dd9bfa46"
-dependencies = [
- "diff",
- "filetime",
- "getopts",
- "libc",
- "log",
- "miow 0.3.3",
- "regex",
- "rustfix",
- "serde",
- "serde_derive",
- "serde_json",
- "tempfile",
- "tester 0.6.0",
- "winapi 0.3.8",
-]
-
 [[package]]
 name = "compiletest_rs"
 version = "0.4.0"
@@ -635,7 +613,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "tempfile",
- "tester 0.7.0",
+ "tester",
  "winapi 0.3.8",
 ]
 
@@ -2223,7 +2201,7 @@ dependencies = [
  "byteorder",
  "cargo_metadata 0.9.0",
  "colored",
- "compiletest_rs 0.3.26",
+ "compiletest_rs",
  "directories",
  "env_logger 0.7.1",
  "getrandom",
@@ -3221,6 +3199,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_fs_util",
  "rustc_index",
  "rustc_macros",
@@ -3596,6 +3575,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_interface",
  "rustc_lint",
  "rustc_metadata",
@@ -3629,6 +3609,15 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "rustc_feature"
+version = "0.0.0"
+dependencies = [
+ "lazy_static 1.3.0",
+ "rustc_data_structures",
+ "syntax_pos",
+]
+
 [[package]]
 name = "rustc_fs_util"
 version = "0.0.0"
@@ -3704,6 +3693,7 @@ dependencies = [
  "rustc",
  "rustc_data_structures",
  "rustc_error_codes",
+ "rustc_feature",
  "rustc_index",
  "rustc_target",
  "syntax",
@@ -3808,6 +3798,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_lexer",
  "rustc_target",
  "smallvec 1.0.0",
@@ -3824,6 +3815,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_index",
  "rustc_parse",
  "rustc_target",
@@ -3866,6 +3858,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_metadata",
  "smallvec 1.0.0",
  "syntax",
@@ -4464,6 +4457,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_index",
  "rustc_lexer",
  "rustc_macros",
@@ -4480,6 +4474,7 @@ dependencies = [
  "log",
  "rustc_data_structures",
  "rustc_errors",
+ "rustc_feature",
  "rustc_lexer",
  "rustc_parse",
  "serialize",
@@ -4497,6 +4492,7 @@ dependencies = [
  "rustc_data_structures",
  "rustc_error_codes",
  "rustc_errors",
+ "rustc_feature",
  "rustc_parse",
  "rustc_target",
  "smallvec 1.0.0",
@@ -4621,17 +4617,6 @@ dependencies = [
  "term 0.0.0",
 ]
 
-[[package]]
-name = "tester"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7647e6d732eb84375d8e7abda37818f81861ddbfc7235e33f4983cb254b71e4f"
-dependencies = [
- "getopts",
- "libc",
- "term 0.6.0",
-]
-
 [[package]]
 name = "tester"
 version = "0.7.0"