Skip to content

Commit d70c469

Browse files
Update ui_test requirement from 0.23.0 to 0.29.1 (#18289)
# Objective - Fixes #18223. ## Solution - Updated ui_test requirement from 0.23.0 to 0.29.1. - Updated code to use the new APIs. ## Testing - Ran CI locally. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 6299e3d commit d70c469

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

tools/compile_fail_utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
88
publish = false
99

1010
[dependencies]
11-
ui_test = "0.23.0"
11+
ui_test = "0.29.1"
1212

1313
[[test]]
1414
name = "example"

tools/compile_fail_utils/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ use std::{
77
pub use ui_test;
88

99
use ui_test::{
10+
bless_output_files,
1011
color_eyre::eyre::eyre,
1112
default_file_filter, default_per_file_config,
1213
dependencies::DependencyBuilder,
13-
run_tests_generic,
14+
ignore_output_conflict, run_tests_generic,
1415
spanned::Spanned,
1516
status_emitter::{Gha, StatusEmitter, Text},
16-
Args, Config, OutputConflictHandling,
17+
Args, Config,
1718
};
1819

1920
/// Use this instead of hand rolling configs.
@@ -44,10 +45,10 @@ fn basic_config(root_dir: impl Into<PathBuf>, args: &Args) -> ui_test::Result<Co
4445
.to_string(),
4546
),
4647
output_conflict_handling: if env::var_os("BLESS").is_some() {
47-
OutputConflictHandling::Bless
48+
bless_output_files
4849
} else {
4950
// stderr output changes between rust versions so we just rely on annotations
50-
OutputConflictHandling::Ignore
51+
ignore_output_conflict
5152
},
5253
..Config::rustc(root_dir)
5354
};

0 commit comments

Comments
 (0)