diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c78020..4364a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed * default comment symbols for `Config::cargo` changed to `#` +* Ctrl+C now prints the summary of the tests that were run before Ctrl+C is pressed ### Removed diff --git a/Cargo.lock b/Cargo.lock index b5420d0..058c646 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,6 +54,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + [[package]] name = "bstr" version = "1.9.1" @@ -109,6 +115,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "color-eyre" version = "0.6.3" @@ -180,6 +192,16 @@ version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +[[package]] +name = "ctrlc" +version = "3.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +dependencies = [ + "nix", + "windows-sys 0.59.0", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -269,6 +291,18 @@ dependencies = [ "adler", ] +[[package]] +name = "nix" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -569,6 +603,7 @@ dependencies = [ "colored", "comma", "crossbeam-channel", + "ctrlc", "indicatif", "lazy_static", "levenshtein", @@ -614,7 +649,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -634,18 +678,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -656,9 +700,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -668,9 +712,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -680,15 +724,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -698,9 +742,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -710,9 +754,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -722,9 +766,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -734,6 +778,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/Cargo.toml b/Cargo.toml index b712a64..f97743c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,6 +30,9 @@ annotate-snippets = { version = "0.11.2" } levenshtein = "1.0.5" spanned = "0.3.0" +[dev-dependencies] +ctrlc = "3.4.5" + [dependencies.regex] version = "1.5.5" default-features = false diff --git a/examples/rustc_basic.rs b/examples/rustc_basic.rs index c06ec3b..c7c4c37 100644 --- a/examples/rustc_basic.rs +++ b/examples/rustc_basic.rs @@ -1,8 +1,13 @@ +use std::sync::atomic::Ordering; use ui_test::{run_tests, Config}; fn main() -> ui_test::color_eyre::Result<()> { + let config = Config::rustc("examples_tests/rustc_basic"); + let abort_check = config.abort_check.clone(); + ctrlc::set_handler(move || abort_check.store(true, Ordering::Relaxed))?; + // Compile all `.rs` files in the given directory (relative to your // Cargo.toml) and compare their output against the corresponding // `.stderr` files. - run_tests(Config::rustc("examples_tests/rustc_basic")) + run_tests(config) } diff --git a/src/aux_builds.rs b/src/aux_builds.rs index 607887a..67a7221 100644 --- a/src/aux_builds.rs +++ b/src/aux_builds.rs @@ -140,6 +140,11 @@ impl Build for AuxBuilder { // Now run the command again to fetch the output filenames aux_cmd.arg("--print").arg("file-names"); let output = aux_cmd.output().unwrap(); + + if build_manager.aborted() { + return Err(Errored::aborted()); + } + assert!(output.status.success()); let mut extra_args = vec![]; diff --git a/src/build_manager.rs b/src/build_manager.rs index 810c473..325b0fa 100644 --- a/src/build_manager.rs +++ b/src/build_manager.rs @@ -33,7 +33,8 @@ pub struct BuildManager { new_job_submitter: Sender, } -type NewJob = Box FnOnce(&'a Sender) -> Result<()>>; +/// Type of closure that is used to run individual tests. +pub type NewJob = Box FnOnce(&'a Sender) -> Result<()>>; impl BuildManager { /// Create a new `BuildManager` for a specific `Config`. Each `Config` needs @@ -49,6 +50,9 @@ impl BuildManager { /// Lazily add more jobs after a test has finished. These are added to the queue /// as normally, but nested below the test. pub fn add_new_job(&self, job: impl Send + 'static + FnOnce() -> TestRun) { + if self.aborted() { + return; + } self.new_job_submitter .send(Box::new(move |sender| Ok(sender.send(job())?))) .unwrap() @@ -114,6 +118,7 @@ impl BuildManager { stderr: vec![], stdout: vec![], }), + self.aborted(), ); res }) @@ -132,4 +137,9 @@ impl BuildManager { pub fn config(&self) -> &Config { &self.config } + + /// Whether the build was cancelled + pub fn aborted(&self) -> bool { + self.config.aborted() + } } diff --git a/src/config.rs b/src/config.rs index 0c3d43e..eec3381 100644 --- a/src/config.rs +++ b/src/config.rs @@ -20,6 +20,7 @@ use std::{ collections::BTreeMap, num::NonZeroUsize, path::{Path, PathBuf}, + sync::{atomic::AtomicBool, Arc}, }; mod args; @@ -63,6 +64,10 @@ pub struct Config { pub custom_comments: BTreeMap<&'static str, CommandParserFunc>, /// Custom diagnostic extractor (invoked on the output of tests) pub diagnostic_extractor: fn(&Path, &[u8]) -> Diagnostics, + /// An atomic bool that can be set to `true` to abort all tests. + /// Will not cancel child processes, but if set from a Ctrl+C handler, + /// the pressing of Ctrl+C will already have cancelled child processes. + pub abort_check: Arc, } impl Config { @@ -157,6 +162,7 @@ impl Config { comment_start: "//", custom_comments: Default::default(), diagnostic_extractor: rustc_stderr::process, + abort_check: Default::default(), }; config .custom_comments @@ -409,6 +415,10 @@ impl Config { .all(|c| self.test_condition(c)) ^ self.run_only_ignored } + + pub(crate) fn aborted(&self) -> bool { + self.abort_check.load(std::sync::atomic::Ordering::Relaxed) + } } #[derive(Debug, Clone)] diff --git a/src/custom_flags/run.rs b/src/custom_flags/run.rs index cb6a35a..fbdc41d 100644 --- a/src/custom_flags/run.rs +++ b/src/custom_flags/run.rs @@ -42,6 +42,13 @@ impl Flag for Run { build_manager.add_new_job(move || { cmd.arg("--print").arg("file-names"); let output = cmd.output().unwrap(); + if config.aborted() { + return TestRun { + result: Err(Errored::aborted()), + status: config.status, + abort_check: config.config.abort_check.clone(), + }; + } assert!(output.status.success(), "{cmd:#?}: {output:#?}"); let mut files = output.stdout.lines(); @@ -61,6 +68,14 @@ impl Flag for Run { .output() .unwrap_or_else(|err| panic!("exe file: {}: {err}", display(&exe_file))); + if config.aborted() { + return TestRun { + result: Err(Errored::aborted()), + status: config.status, + abort_check: config.config.abort_check.clone(), + }; + } + let mut errors = vec![]; config.check_test_output(&mut errors, &output.stdout, &output.stderr); @@ -93,6 +108,7 @@ impl Flag for Run { }) }, status: config.status, + abort_check: config.config.abort_check, } }); Ok(()) diff --git a/src/custom_flags/rustfix.rs b/src/custom_flags/rustfix.rs index 1341448..b2b9675 100644 --- a/src/custom_flags/rustfix.rs +++ b/src/custom_flags/rustfix.rs @@ -219,7 +219,9 @@ fn compile_fixed( .arg(format!("{crate_name}_________{}", i + 1)); build_manager.add_new_job(move || { let output = cmd.output().unwrap(); - let result = if output.status.success() { + let result = if fixed_config.aborted() { + Err(Errored::aborted()) + } else if output.status.success() { Ok(TestOk::Ok) } else { let diagnostics = fixed_config.process(&output.stderr); @@ -247,6 +249,7 @@ fn compile_fixed( TestRun { result, status: fixed_config.status, + abort_check: fixed_config.config.abort_check, } }); } diff --git a/src/lib.rs b/src/lib.rs index 610c080..fda064f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ #![doc = include_str!("../README.md")] use build_manager::BuildManager; +use build_manager::NewJob; pub use color_eyre; use color_eyre::eyre::eyre; #[cfg(feature = "rustc")] @@ -24,6 +25,7 @@ use status_emitter::{StatusEmitter, TestStatus}; use std::collections::VecDeque; use std::path::Path; use std::process::Command; +use std::sync::atomic::Ordering; use std::sync::Arc; use test_result::TestRun; pub use test_result::{Errored, TestOk}; @@ -233,6 +235,7 @@ pub fn run_tests_generic( let path = status.path(); let file_contents = Spanned::read_from_file(path).unwrap(); let mut config = build_manager.config().clone(); + let abort_check = config.abort_check.clone(); per_file_config(&mut config, &file_contents); let result = match std::panic::catch_unwind(|| { parse_and_test_file( @@ -247,6 +250,7 @@ pub fn run_tests_generic( finished_files_sender.send(TestRun { result: Err(err), status, + abort_check, })?; return Ok(()); } @@ -254,20 +258,19 @@ pub fn run_tests_generic( finished_files_sender.send(TestRun { result: Err(Errored { command: "".into(), - errors: vec![ - Error::Bug( + errors: vec![Error::Bug( *Box::< dyn std::any::Any + Send + 'static, >::downcast::( err ) .unwrap(), - ), - ], + )], stderr: vec![], stdout: vec![], }), status, + abort_check, })?; return Ok(()); } @@ -276,8 +279,7 @@ pub fn run_tests_generic( finished_files_sender.send(result)?; } Ok(()) - }) - as Box) -> Result<()>>) + }) as NewJob) .unwrap(); } else { filtered += 1; @@ -293,9 +295,13 @@ pub fn run_tests_generic( }, |finished_files_recv| { for run in finished_files_recv { - run.status.done(&run.result); + let aborted = run.abort_check.load(Ordering::Relaxed); + run.status.done(&run.result, aborted); - results.push(run); + // Do not write summaries for cancelled tests + if !aborted { + results.push(run); + } } }, )?; @@ -303,8 +309,10 @@ pub fn run_tests_generic( let mut failures = vec![]; let mut succeeded = 0; let mut ignored = 0; + let mut aborted = false; for run in results { + aborted |= run.abort_check.load(Ordering::Relaxed); match run.result { Ok(TestOk::Ok) => succeeded += 1, Ok(TestOk::Ignored) => ignored += 1, @@ -312,7 +320,8 @@ pub fn run_tests_generic( } } - let mut failure_emitter = status_emitter.finalize(failures.len(), succeeded, ignored, filtered); + let mut failure_emitter = + status_emitter.finalize(failures.len(), succeeded, ignored, filtered, aborted); for ( status, Errored { @@ -354,6 +363,7 @@ fn parse_and_test_file( runs.push(TestRun { result: Ok(TestOk::Ignored), status, + abort_check: config.abort_check.clone(), }); continue; } @@ -369,6 +379,7 @@ fn parse_and_test_file( runs.push(TestRun { result, status: test_config.status, + abort_check: test_config.config.abort_check, }) } Ok(runs) diff --git a/src/per_test_config.rs b/src/per_test_config.rs index 111f7b0..8036259 100644 --- a/src/per_test_config.rs +++ b/src/per_test_config.rs @@ -394,6 +394,11 @@ impl TestConfig { let output = crate::core::run_command(&mut cmd)?; + // Do not bless aborted tests + if build_manager.aborted() { + return Err(Errored::aborted()); + } + let output = self.check_test_result(&cmd, output)?; for rev in self.comments() { @@ -417,4 +422,8 @@ impl TestConfig { .into() }) } + + pub(crate) fn aborted(&self) -> bool { + self.config.aborted() + } } diff --git a/src/status_emitter.rs b/src/status_emitter.rs index 124acfd..320a6ab 100644 --- a/src/status_emitter.rs +++ b/src/status_emitter.rs @@ -43,6 +43,7 @@ pub trait StatusEmitter: Sync + RefUnwindSafe { succeeded: usize, ignored: usize, filtered: usize, + aborted: bool, ) -> Box; } @@ -74,7 +75,7 @@ pub trait TestStatus: Send + Sync + RefUnwindSafe { ) -> Box; /// A test has finished, handle the result immediately. - fn done(&self, _result: &TestResult) {} + fn done(&self, _result: &TestResult, _aborted: bool) {} /// The path of the test file. fn path(&self) -> &Path; @@ -107,6 +108,7 @@ impl StatusEmitter for () { _succeeded: usize, _ignored: usize, _filtered: usize, + _aborted: bool, ) -> Box { Box::new(()) } @@ -388,12 +390,14 @@ struct TextTest { } impl TestStatus for TextTest { - fn done(&self, result: &TestResult) { + fn done(&self, result: &TestResult, aborted: bool) { let new_leftover_msg = if self.text.is_quiet_output() { if self.inc_counter.fetch_sub(1, Ordering::Relaxed) == 1 { self.text.sender.send(Msg::Inc).unwrap(); } None + } else if aborted { + None } else { let result = match result { Ok(TestOk::Ok) => "ok".green(), @@ -559,6 +563,7 @@ impl StatusEmitter for Text { succeeded: usize, ignored: usize, filtered: usize, + aborted: bool, ) -> Box { self.sender.send(Msg::Finish).unwrap(); while !self.sender.is_empty() { @@ -575,6 +580,7 @@ impl StatusEmitter for Text { succeeded: usize, ignored: usize, filtered: usize, + aborted: bool, } impl Summary for Summarizer { @@ -599,7 +605,11 @@ impl StatusEmitter for Text { fn drop(&mut self) { if self.failures.is_empty() { println!(); - print!("test result: {}.", "ok".green()); + if self.aborted { + print!("test result: cancelled."); + } else { + print!("test result: {}.", "ok".green()); + } } else { println!("{}", "FAILURES:".bright_red().underline().bold()); for line in &self.failures { @@ -636,6 +646,7 @@ impl StatusEmitter for Text { succeeded, ignored, filtered, + aborted, }) } } @@ -1096,6 +1107,8 @@ impl StatusEmitter for Gha { succeeded: usize, ignored: usize, filtered: usize, + // Can't aborted on gha + _aborted: bool, ) -> Box { struct Summarizer { failures: Vec, @@ -1153,9 +1166,9 @@ impl StatusEmitter for Gha { } impl TestStatus for (T, U) { - fn done(&self, result: &TestResult) { - self.0.done(result); - self.1.done(result); + fn done(&self, result: &TestResult, aborted: bool) { + self.0.done(result, aborted); + self.1.done(result, aborted); } fn failed_test<'a>( @@ -1208,17 +1221,20 @@ impl StatusEmitter for (T, U) { succeeded: usize, ignored: usize, filtered: usize, + aborted: bool, ) -> Box { Box::new(( - self.1.finalize(failures, succeeded, ignored, filtered), - self.0.finalize(failures, succeeded, ignored, filtered), + self.1 + .finalize(failures, succeeded, ignored, filtered, aborted), + self.0 + .finalize(failures, succeeded, ignored, filtered, aborted), )) } } impl TestStatus for Box { - fn done(&self, result: &TestResult) { - (**self).done(result); + fn done(&self, result: &TestResult, aborted: bool) { + (**self).done(result, aborted); } fn path(&self) -> &Path { @@ -1258,8 +1274,9 @@ impl StatusEmitter for Box { succeeded: usize, ignored: usize, filtered: usize, + aborted: bool, ) -> Box { - (**self).finalize(failures, succeeded, ignored, filtered) + (**self).finalize(failures, succeeded, ignored, filtered, aborted) } } diff --git a/src/test_result.rs b/src/test_result.rs index 6b68dab..a9c85ff 100644 --- a/src/test_result.rs +++ b/src/test_result.rs @@ -1,5 +1,7 @@ //! Various data structures used for carrying information about test success or failure +use std::sync::{atomic::AtomicBool, Arc}; + use crate::{status_emitter::TestStatus, Error}; use color_eyre::eyre::Result; @@ -38,6 +40,10 @@ impl Errored { command: message.into(), } } + + pub(crate) fn aborted() -> Errored { + Self::new(vec![], "aborted") + } } /// Result of an actual test or sub-test (revision, fixed, run, ...) including its status. @@ -46,4 +52,6 @@ pub struct TestRun { pub result: TestResult, /// Usually created via `for_revsion` or `for_path` pub status: Box, + /// Whether the run was aborted prematurely + pub abort_check: Arc, } diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock index 71bc833..0d3ac15 100644 --- a/tests/integrations/basic-bin/Cargo.lock +++ b/tests/integrations/basic-bin/Cargo.lock @@ -339,9 +339,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "linux-raw-sys" diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock index a1c4d89..81f7f2a 100644 --- a/tests/integrations/basic-fail-mode/Cargo.lock +++ b/tests/integrations/basic-fail-mode/Cargo.lock @@ -339,9 +339,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "linux-raw-sys" diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock index 1c0e9db..d7a57bb 100644 --- a/tests/integrations/basic-fail/Cargo.lock +++ b/tests/integrations/basic-fail/Cargo.lock @@ -339,9 +339,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "linux-raw-sys" diff --git a/tests/integrations/basic/Cargo.lock b/tests/integrations/basic/Cargo.lock index 1039bba..e0a92d0 100644 --- a/tests/integrations/basic/Cargo.lock +++ b/tests/integrations/basic/Cargo.lock @@ -290,9 +290,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "linux-raw-sys" @@ -695,7 +695,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", ] [[package]] @@ -715,17 +715,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -736,9 +737,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -748,9 +749,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -760,9 +761,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -772,9 +779,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -784,9 +791,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -796,9 +803,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -808,6 +815,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock index 71bc833..0d3ac15 100644 --- a/tests/integrations/cargo-run/Cargo.lock +++ b/tests/integrations/cargo-run/Cargo.lock @@ -339,9 +339,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "linux-raw-sys" diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock index f90b035..9d4c0db 100644 --- a/tests/integrations/dep-fail/Cargo.lock +++ b/tests/integrations/dep-fail/Cargo.lock @@ -257,9 +257,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "memchr" @@ -621,7 +621,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -641,17 +641,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -662,9 +663,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -674,9 +675,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -686,9 +687,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -698,9 +705,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -710,9 +717,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -722,9 +729,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -734,6 +741,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/tests/integrations/ui_test_dep_bug/Cargo.lock b/tests/integrations/ui_test_dep_bug/Cargo.lock index 0e51e6c..ecd88f3 100644 --- a/tests/integrations/ui_test_dep_bug/Cargo.lock +++ b/tests/integrations/ui_test_dep_bug/Cargo.lock @@ -258,9 +258,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "memchr" @@ -626,7 +626,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -646,17 +646,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -667,9 +668,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -679,9 +680,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -691,9 +692,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -703,9 +710,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -715,9 +722,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -727,9 +734,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -739,6 +746,6 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"