Skip to content

Commit 4c99809

Browse files
bump ui_test to 0.30.1 (#15184)
@oli-obk I am not entirely sure whether this is the intended port, the types look a bit gnarly and the changelog doesn't say anything about this breakage... but oli-obk/ui_test#316 does something similar. *Please write a short comment explaining your change (or "none" for internal only changes)* changelog: none
2 parents bca8931 + 1fcd632 commit 4c99809

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ anstream = "0.6.18"
3434

3535
[dev-dependencies]
3636
cargo_metadata = "0.18.1"
37-
ui_test = "0.29.2"
37+
ui_test = "0.30.1"
3838
regex = "1.5.5"
3939
serde = { version = "1.0.145", features = ["derive"] }
4040
serde_json = "1.0.122"

tests/compile-test.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use ui_test::custom_flags::Flag;
1717
use ui_test::custom_flags::edition::Edition;
1818
use ui_test::custom_flags::rustfix::RustfixMode;
1919
use ui_test::spanned::Spanned;
20-
use ui_test::{Args, CommandBuilder, Config, Match, error_on_output_conflict, status_emitter};
20+
use ui_test::status_emitter::StatusEmitter;
21+
use ui_test::{Args, CommandBuilder, Config, Match, error_on_output_conflict};
2122

2223
use std::collections::{BTreeMap, HashMap};
2324
use std::env::{self, set_var, var_os};
@@ -217,7 +218,7 @@ fn run_ui(cx: &TestContext) {
217218
vec![config],
218219
ui_test::default_file_filter,
219220
ui_test::default_per_file_config,
220-
status_emitter::Text::from(cx.args.format),
221+
Box::<dyn StatusEmitter>::from(cx.args.format),
221222
)
222223
.unwrap();
223224
}
@@ -233,7 +234,7 @@ fn run_internal_tests(cx: &TestContext) {
233234
vec![config],
234235
ui_test::default_file_filter,
235236
ui_test::default_per_file_config,
236-
status_emitter::Text::from(cx.args.format),
237+
Box::<dyn StatusEmitter>::from(cx.args.format),
237238
)
238239
.unwrap();
239240
}
@@ -257,7 +258,7 @@ fn run_ui_toml(cx: &TestContext) {
257258
.envs
258259
.push(("CLIPPY_CONF_DIR".into(), Some(path.parent().unwrap().into())));
259260
},
260-
status_emitter::Text::from(cx.args.format),
261+
Box::<dyn StatusEmitter>::from(cx.args.format),
261262
)
262263
.unwrap();
263264
}
@@ -304,7 +305,7 @@ fn run_ui_cargo(cx: &TestContext) {
304305
.then(|| ui_test::default_any_file_filter(path, config) && !ignored_32bit(path))
305306
},
306307
|_config, _file_contents| {},
307-
status_emitter::Text::from(cx.args.format),
308+
Box::<dyn StatusEmitter>::from(cx.args.format),
308309
)
309310
.unwrap();
310311
}

0 commit comments

Comments
 (0)