Bump ui_test crate

rust-lang · Aug 9, 2023 · 3daca0b · 3daca0b
1 parent 11cf417
commit 3daca0b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
 termize = "0.1"
 
 [dev-dependencies]
-ui_test = "0.13"
+ui_test = "0.15"
 tester = "0.9"
 regex = "1.5"
 toml = "0.7.3"

diff --git a/tests/compile-test.rs b/tests/compile-test.rs
@@ -200,9 +200,10 @@ fn run_ui() {
     let quiet = args.quiet;
 
     compiletest::run_tests_generic(
-        config,
+        vec![config],
+        std::thread::available_parallelism().unwrap(),
         args,
-        move |path, args| compiletest::default_file_filter(path, args) && test_filter(path),
+        move |path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
         compiletest::default_per_file_config,
         if quiet {
             status_emitter::Text::quiet()
@@ -226,9 +227,10 @@ fn run_internal_tests() {
     let quiet = args.quiet;
 
     compiletest::run_tests_generic(
-        config,
+        vec![config],
+        std::thread::available_parallelism().unwrap(),
         args,
-        move |path, args| compiletest::default_file_filter(path, args) && test_filter(path),
+        move |path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
         compiletest::default_per_file_config,
         if quiet {
             status_emitter::Text::quiet()
@@ -258,16 +260,15 @@ fn run_ui_toml() {
     let quiet = args.quiet;
 
     ui_test::run_tests_generic(
-        config,
+        vec![config],
+        std::thread::available_parallelism().unwrap(),
         args,
-        |path, args| compiletest::default_file_filter(path, args) && test_filter(path),
-        |config, path| {
-            let mut config = config.clone();
+        |path, args, config| compiletest::default_file_filter(path, args, config) && test_filter(path),
+        |config, path, _file_contents| {
             config
                 .program
                 .envs
                 .push(("CLIPPY_CONF_DIR".into(), Some(path.parent().unwrap().into())));
-            Some(config)
         },
         if quiet {
             status_emitter::Text::quiet()
@@ -317,19 +318,18 @@ fn run_ui_cargo() {
     let quiet = args.quiet;
 
     ui_test::run_tests_generic(
-        config,
+        vec![config],
+        std::thread::available_parallelism().unwrap(),
         args,
-        |path, _args| test_filter(path) && path.ends_with("Cargo.toml"),
-        |config, path| {
-            let mut config = config.clone();
+        |path, _args, _config| test_filter(path) && path.ends_with("Cargo.toml"),
+        |config, path, _file_contents| {
             config.out_dir = canonicalize(
                 std::env::current_dir()
                     .unwrap()
                     .join("target")
                     .join("ui_test_cargo/")
                     .join(path.parent().unwrap()),
             );
-            Some(config)
         },
         if quiet {
             status_emitter::Text::quiet()