From d70c469483b0d4ba201cecc6d2925de28df7ffae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Maita?=
 <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:34:33 +0100
Subject: [PATCH] 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>
---
 tools/compile_fail_utils/Cargo.toml | 2 +-
 tools/compile_fail_utils/src/lib.rs | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/compile_fail_utils/Cargo.toml b/tools/compile_fail_utils/Cargo.toml
index 7fa33d7962..215c82d419 100644
--- a/tools/compile_fail_utils/Cargo.toml
+++ b/tools/compile_fail_utils/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 publish = false
 
 [dependencies]
-ui_test = "0.23.0"
+ui_test = "0.29.1"
 
 [[test]]
 name = "example"
diff --git a/tools/compile_fail_utils/src/lib.rs b/tools/compile_fail_utils/src/lib.rs
index 816e81d062..46e975a29f 100644
--- a/tools/compile_fail_utils/src/lib.rs
+++ b/tools/compile_fail_utils/src/lib.rs
@@ -7,13 +7,14 @@ use std::{
 pub use ui_test;
 
 use ui_test::{
+    bless_output_files,
     color_eyre::eyre::eyre,
     default_file_filter, default_per_file_config,
     dependencies::DependencyBuilder,
-    run_tests_generic,
+    ignore_output_conflict, run_tests_generic,
     spanned::Spanned,
     status_emitter::{Gha, StatusEmitter, Text},
-    Args, Config, OutputConflictHandling,
+    Args, Config,
 };
 
 /// 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
                 .to_string(),
         ),
         output_conflict_handling: if env::var_os("BLESS").is_some() {
-            OutputConflictHandling::Bless
+            bless_output_files
         } else {
             // stderr output changes between rust versions so we just rely on annotations
-            OutputConflictHandling::Ignore
+            ignore_output_conflict
         },
         ..Config::rustc(root_dir)
     };