From f54b4ff1b1ccaa7bffab88238bb7290396c1887a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 06:21:21 +0000
Subject: [PATCH 1/2] Update ui_test requirement from 0.23.0 to 0.29.1

Updates the requirements on [ui_test](https://github.com/oli-obk/ui_test) to permit the latest version.
- [Release notes](https://github.com/oli-obk/ui_test/releases)
- [Changelog](https://github.com/oli-obk/ui_test/blob/main/CHANGELOG.md)
- [Commits](https://github.com/oli-obk/ui_test/compare/0.23.0...0.29.1)

---
updated-dependencies:
- dependency-name: ui_test
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tools/compile_fail_utils/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/compile_fail_utils/Cargo.toml b/tools/compile_fail_utils/Cargo.toml
index 7fa33d79620df..215c82d419b98 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"

From 151d583d07f6b0212209c86852955b061fb83e70 Mon Sep 17 00:00:00 2001
From: mnmaita <47983254+mnmaita@users.noreply.github.com>
Date: Thu, 13 Mar 2025 01:21:05 +0100
Subject: [PATCH 2/2] Fixes breaking changes

---
 tools/compile_fail_utils/src/lib.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/compile_fail_utils/src/lib.rs b/tools/compile_fail_utils/src/lib.rs
index 816e81d062865..46e975a29f979 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)
     };