diff --git a/CHANGELOG.md b/CHANGELOG.md index c383ed33..530d63d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +### Changed + +## [0.30.5] - 2026-05-04 + +### Added + +- Added support for Cargo's new `build-dir` layout + +### Fixed + - Update the help string in CLI to include new flags ### Changed diff --git a/Cargo.lock b/Cargo.lock index 146bf664..5697df9c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -586,7 +586,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index f9467a8c..6145aa1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ui_test" -version = "0.30.4" +version = "0.30.5" edition = "2021" license = "MIT OR Apache-2.0" description = "A test framework for testing rustc diagnostics output" diff --git a/src/dependencies.rs b/src/dependencies.rs index f5be6f9b..09fa2c99 100644 --- a/src/dependencies.rs +++ b/src/dependencies.rs @@ -185,9 +185,16 @@ fn build_dependencies_inner( filename.pop(); // We also validate that the path looks as expected before we actually skip. if filename.file_name().unwrap_or_default() != "deps" { - // Either cargo changed or this is a weird corner case, let's just - // keep it. - break 'skip_crate false; + // Check if the new Cargo build-dir v2 layout is enabled + if filename.file_name().unwrap_or_default() == "out" { + filename.pop(); // `out` + filename.pop(); // `` + filename.pop(); // `` + } else { + // Either cargo changed or this is a weird corner case, let's just + // keep it. + break 'skip_crate false; + } } filename.pop(); // This is the profile name, `debug` or `release` or so. diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock index 38bc9376..f9b5b474 100644 --- a/tests/integrations/basic-bin/Cargo.lock +++ b/tests/integrations/basic-bin/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock index 20261f25..f96435b3 100644 --- a/tests/integrations/basic-fail-mode/Cargo.lock +++ b/tests/integrations/basic-fail-mode/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock index f3d7d0b1..08cdece3 100644 --- a/tests/integrations/basic-fail/Cargo.lock +++ b/tests/integrations/basic-fail/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic/Cargo.lock b/tests/integrations/basic/Cargo.lock index 3fb33a5c..9f83190c 100644 --- a/tests/integrations/basic/Cargo.lock +++ b/tests/integrations/basic/Cargo.lock @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock index 38bc9376..f9b5b474 100644 --- a/tests/integrations/cargo-run/Cargo.lock +++ b/tests/integrations/cargo-run/Cargo.lock @@ -691,7 +691,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock index 284c4fa5..474a67ca 100644 --- a/tests/integrations/dep-fail/Cargo.lock +++ b/tests/integrations/dep-fail/Cargo.lock @@ -568,7 +568,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/ui_test_dep_bug/Cargo.lock b/tests/integrations/ui_test_dep_bug/Cargo.lock index 1b4afa2b..c276e8ff 100644 --- a/tests/integrations/ui_test_dep_bug/Cargo.lock +++ b/tests/integrations/ui_test_dep_bug/Cargo.lock @@ -573,7 +573,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.30.4" +version = "0.30.5" dependencies = [ "annotate-snippets", "anyhow",