Skip to content

Commit

Permalink
Auto merge of #13098 - oli-obk:bump_ui_test, r=Alexendoo
Browse files Browse the repository at this point in the history
Bump ui_test version

r? `@alexendoo`

the rustfix diff is caused by oli-obk/ui_test#244

This should solve the issues around missing summaries at the end

changelog: none
  • Loading branch information
bors committed Jul 15, 2024
2 parents 10ba798 + 3b390d4 commit 22eeb11
Show file tree
Hide file tree
Showing 43 changed files with 225 additions and 2,530 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ color-print = "0.3.4"
anstream = "0.6.0"

[dev-dependencies]
ui_test = "0.23"
ui_test = "0.24"
regex = "1.5.5"
toml = "0.7.3"
walkdir = "2.3"
Expand Down
5 changes: 3 additions & 2 deletions tests/compile-test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

use ui_test::custom_flags::rustfix::RustfixMode;
use ui_test::spanned::Spanned;
use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling};
use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, OutputConflictHandling};

use std::collections::BTreeMap;
use std::env::{self, set_var, var_os};
Expand Down Expand Up @@ -122,7 +122,8 @@ fn base_config(test_dir: &str) -> (Config, Args) {
out_dir: target_dir.join("ui_test"),
..Config::rustc(Path::new("tests").join(test_dir))
};
config.comment_defaults.base().mode = Some(Spanned::dummy(Mode::Yolo)).into();
config.comment_defaults.base().exit_status = None.into();
config.comment_defaults.base().require_annotations = None.into();
config
.comment_defaults
.base()
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![deny(clippy::index_refutable_slice)]

//@no-rustfix: need to change the suggestion to a multipart suggestion

fn below_limit() {
let slice: Option<&[u32]> = Some(&[1, 2, 3]);
if let Some(slice) = slice {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: this binding can be a slice pattern to avoid indexing
--> tests/ui-toml/max_suggested_slice_pattern_length/index_refutable_slice.rs:5:17
--> tests/ui-toml/max_suggested_slice_pattern_length/index_refutable_slice.rs:7:17
|
LL | if let Some(slice) = slice {
| ^^^^^
Expand Down
11 changes: 0 additions & 11 deletions tests/ui/crashes/ice-3717.fixed

This file was deleted.

2 changes: 2 additions & 0 deletions tests/ui/crashes/ice-3717.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![deny(clippy::implicit_hasher)]

//@no-rustfix: need to change the suggestion to a multipart suggestion

use std::collections::HashSet;

fn main() {}
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/crashes/ice-3717.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: parameter of type `HashSet` should be generalized over different hashers
--> tests/ui/crashes/ice-3717.rs:7:21
--> tests/ui/crashes/ice-3717.rs:9:21
|
LL | pub fn ice_3717(_: &HashSet<usize>) {
| ^^^^^^^^^^^^^^
Expand Down
295 changes: 0 additions & 295 deletions tests/ui/derivable_impls.fixed

This file was deleted.

2 changes: 2 additions & 0 deletions tests/ui/derivable_impls.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#![allow(dead_code)]

//@no-rustfix: need to change the suggestion to a multipart suggestion

use std::collections::HashMap;

struct FooDefault<'a> {
Expand Down
Loading

0 comments on commit 22eeb11

Please sign in to comment.