From d3a4e522e66c1c3c5a58b481e16a1ee3940a1ec9 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Sun, 8 Sep 2024 14:57:25 +0200 Subject: [PATCH] Make more things public for miri --- CHANGELOG.md | 12 ++++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- src/per_test_config.rs | 7 ++++++- tests/integrations/basic-bin/Cargo.lock | 2 +- tests/integrations/basic-fail-mode/Cargo.lock | 2 +- tests/integrations/basic-fail/Cargo.lock | 2 +- tests/integrations/basic/Cargo.lock | 2 +- tests/integrations/cargo-run/Cargo.lock | 2 +- tests/integrations/dep-fail/Cargo.lock | 2 +- tests/integrations/ui_test_dep_bug/Cargo.lock | 2 +- 11 files changed, 27 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 591e25d7..fc658ab5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +* Made more code public for miri to use + +### Removed + +## [0.26.3] - 2024-09-08 + +### Added + +### Fixed + +### Changed + ### Removed ## [0.26.2] - 2024-09-08 diff --git a/Cargo.lock b/Cargo.lock index 5e0aaed5..0bedd2a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -592,7 +592,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 601c58a7..4783824b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ui_test" -version = "0.26.2" +version = "0.26.3" edition = "2021" license = "MIT OR Apache-2.0" description = "A test framework for testing rustc diagnostics output" diff --git a/src/per_test_config.rs b/src/per_test_config.rs index 08bae877..1a9b47d6 100644 --- a/src/per_test_config.rs +++ b/src/per_test_config.rs @@ -96,7 +96,12 @@ impl TestConfig { self.comments().flat_map(f).collect() } - fn apply_custom(&self, cmd: &mut Command, build_manager: &BuildManager) -> Result<(), Errored> { + /// Apply custom flags (aux builds, dependencies, ...) + pub fn apply_custom( + &self, + cmd: &mut Command, + build_manager: &BuildManager, + ) -> Result<(), Errored> { let mut all = BTreeMap::new(); for rev in self.comments.for_revision(self.status.revision()) { for (&k, flags) in &rev.custom { diff --git a/tests/integrations/basic-bin/Cargo.lock b/tests/integrations/basic-bin/Cargo.lock index 83ea2ed1..c9179913 100644 --- a/tests/integrations/basic-bin/Cargo.lock +++ b/tests/integrations/basic-bin/Cargo.lock @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic-fail-mode/Cargo.lock b/tests/integrations/basic-fail-mode/Cargo.lock index 8d29a9ed..315181a4 100644 --- a/tests/integrations/basic-fail-mode/Cargo.lock +++ b/tests/integrations/basic-fail-mode/Cargo.lock @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic-fail/Cargo.lock b/tests/integrations/basic-fail/Cargo.lock index 0ca1c978..56a949f6 100644 --- a/tests/integrations/basic-fail/Cargo.lock +++ b/tests/integrations/basic-fail/Cargo.lock @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/basic/Cargo.lock b/tests/integrations/basic/Cargo.lock index 15c8fbe2..c222f2c6 100644 --- a/tests/integrations/basic/Cargo.lock +++ b/tests/integrations/basic/Cargo.lock @@ -639,7 +639,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/cargo-run/Cargo.lock b/tests/integrations/cargo-run/Cargo.lock index 83ea2ed1..c9179913 100644 --- a/tests/integrations/cargo-run/Cargo.lock +++ b/tests/integrations/cargo-run/Cargo.lock @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow", diff --git a/tests/integrations/dep-fail/Cargo.lock b/tests/integrations/dep-fail/Cargo.lock index 599170fc..6f14efcd 100644 --- a/tests/integrations/dep-fail/Cargo.lock +++ b/tests/integrations/dep-fail/Cargo.lock @@ -565,7 +565,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" 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 748895d2..c4be0c4d 100644 --- a/tests/integrations/ui_test_dep_bug/Cargo.lock +++ b/tests/integrations/ui_test_dep_bug/Cargo.lock @@ -570,7 +570,7 @@ dependencies = [ [[package]] name = "ui_test" -version = "0.26.2" +version = "0.26.3" dependencies = [ "annotate-snippets", "anyhow",