Skip to content

Commit 4fdb4ed

Browse files
oli-obkoli-obk
committed
Bump ui_test
1 parent ac25a73 commit 4fdb4ed

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎Cargo.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ dependencies = [
531531
"tester",
532532
"tokio",
533533
"toml 0.7.5",
534-
"ui_test 0.17.0",
534+
"ui_test 0.18.1",
535535
"walkdir",
536536
]
537537

@@ -1016,12 +1016,6 @@ version = "1.0.6"
10161016
source = "registry+https://github.com/rust-lang/crates.io-index"
10171017
checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e"
10181018

1019-
[[package]]
1020-
name = "distance"
1021-
version = "0.4.0"
1022-
source = "registry+https://github.com/rust-lang/crates.io-index"
1023-
checksum = "6d9d8664cf849d7d0f3114a3a387d2f5e4303176d746d5a951aaddc66dfe9240"
1024-
10251019
[[package]]
10261020
name = "dlmalloc"
10271021
version = "0.2.4"
@@ -2047,6 +2041,12 @@ version = "1.3.0"
20472041
source = "registry+https://github.com/rust-lang/crates.io-index"
20482042
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
20492043

2044+
[[package]]
2045+
name = "levenshtein"
2046+
version = "1.0.5"
2047+
source = "registry+https://github.com/rust-lang/crates.io-index"
2048+
checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
2049+
20502050
[[package]]
20512051
name = "libc"
20522052
version = "0.2.147"
@@ -5580,9 +5580,9 @@ dependencies = [
55805580

55815581
[[package]]
55825582
name = "ui_test"
5583-
version = "0.17.0"
5583+
version = "0.18.1"
55845584
source = "registry+https://github.com/rust-lang/crates.io-index"
5585-
checksum = "a7823f926a62629304c4a47c23949925f6faa0d4f14ddbce4405d55dbaeab324"
5585+
checksum = "640159421816683e558867ffc0e60ed3a3ed97ec6ccb22c03adb41bf87c5cfa4"
55865586
dependencies = [
55875587
"annotate-snippets",
55885588
"anyhow",
@@ -5593,9 +5593,9 @@ dependencies = [
55935593
"colored",
55945594
"comma",
55955595
"crossbeam-channel",
5596-
"distance",
55975596
"indicatif",
55985597
"lazy_static",
5598+
"levenshtein",
55995599
"prettydiff",
56005600
"regex",
56015601
"rustc_version",

‎src/tools/clippy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
2727
termize = "0.1"
2828

2929
[dev-dependencies]
30-
ui_test = "0.17.0"
30+
ui_test = "0.18.1"
3131
tester = "0.9"
3232
regex = "1.5"
3333
toml = "0.7.3"

‎src/tools/clippy/tests/compile-test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#![warn(rust_2018_idioms, unused_lifetimes)]
55
#![allow(unused_extern_crates)]
66

7-
use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling};
7+
use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling, RustfixMode};
88

99
use std::collections::BTreeMap;
1010
use std::env::{self, set_var, var_os};
@@ -130,7 +130,7 @@ fn base_config(test_dir: &str) -> (Config, Args) {
130130
};
131131

132132
let mut config = Config {
133-
mode: Mode::Yolo { rustfix: true },
133+
mode: Mode::Yolo { rustfix: RustfixMode::Everything },
134134
stderr_filters: vec![(Match::PathBackslash, b"/")],
135135
stdout_filters: vec![],
136136
output_conflict_handling: if bless {

‎src/tools/clippy/tests/ui/derive.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: you are implementing `Clone` explicitly on a `Copy` type
2-
--> $DIR/derive.rs:11:1
2+
--> $DIR/derive.rs:12:1
33
|
44
LL | / impl Clone for Qux {
55
LL | |
@@ -10,7 +10,7 @@ LL | | }
1010
| |_^
1111
|
1212
note: consider deriving `Clone` or removing `Copy`
13-
--> $DIR/derive.rs:11:1
13+
--> $DIR/derive.rs:12:1
1414
|
1515
LL | / impl Clone for Qux {
1616
LL | |
@@ -22,7 +22,7 @@ LL | | }
2222
= note: `-D clippy::expl-impl-clone-on-copy` implied by `-D warnings`
2323

2424
error: you are implementing `Clone` explicitly on a `Copy` type
25-
--> $DIR/derive.rs:36:1
25+
--> $DIR/derive.rs:37:1
2626
|
2727
LL | / impl<'a> Clone for Lt<'a> {
2828
LL | |
@@ -33,7 +33,7 @@ LL | | }
3333
| |_^
3434
|
3535
note: consider deriving `Clone` or removing `Copy`
36-
--> $DIR/derive.rs:36:1
36+
--> $DIR/derive.rs:37:1
3737
|
3838
LL | / impl<'a> Clone for Lt<'a> {
3939
LL | |
@@ -44,7 +44,7 @@ LL | | }
4444
| |_^
4545

4646
error: you are implementing `Clone` explicitly on a `Copy` type
47-
--> $DIR/derive.rs:48:1
47+
--> $DIR/derive.rs:49:1
4848
|
4949
LL | / impl Clone for BigArray {
5050
LL | |
@@ -55,7 +55,7 @@ LL | | }
5555
| |_^
5656
|
5757
note: consider deriving `Clone` or removing `Copy`
58-
--> $DIR/derive.rs:48:1
58+
--> $DIR/derive.rs:49:1
5959
|
6060
LL | / impl Clone for BigArray {
6161
LL | |
@@ -66,7 +66,7 @@ LL | | }
6666
| |_^
6767

6868
error: you are implementing `Clone` explicitly on a `Copy` type
69-
--> $DIR/derive.rs:60:1
69+
--> $DIR/derive.rs:61:1
7070
|
7171
LL | / impl Clone for FnPtr {
7272
LL | |
@@ -77,7 +77,7 @@ LL | | }
7777
| |_^
7878
|
7979
note: consider deriving `Clone` or removing `Copy`
80-
--> $DIR/derive.rs:60:1
80+
--> $DIR/derive.rs:61:1
8181
|
8282
LL | / impl Clone for FnPtr {
8383
LL | |
@@ -88,7 +88,7 @@ LL | | }
8888
| |_^
8989

9090
error: you are implementing `Clone` explicitly on a `Copy` type
91-
--> $DIR/derive.rs:81:1
91+
--> $DIR/derive.rs:82:1
9292
|
9393
LL | / impl<T: Clone> Clone for Generic2<T> {
9494
LL | |
@@ -99,7 +99,7 @@ LL | | }
9999
| |_^
100100
|
101101
note: consider deriving `Clone` or removing `Copy`
102-
--> $DIR/derive.rs:81:1
102+
--> $DIR/derive.rs:82:1
103103
|
104104
LL | / impl<T: Clone> Clone for Generic2<T> {
105105
LL | |

‎src/tools/clippy/tests/ui/temporary_assignment.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: assignment to temporary
2-
--> $DIR/temporary_assignment.rs:47:5
2+
--> $DIR/temporary_assignment.rs:48:5
33
|
44
LL | Struct { field: 0 }.field = 1;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `-D clippy::temporary-assignment` implied by `-D warnings`
88

99
error: assignment to temporary
10-
--> $DIR/temporary_assignment.rs:50:5
10+
--> $DIR/temporary_assignment.rs:51:5
1111
|
1212
LL | / MultiStruct {
1313
LL | |
@@ -18,13 +18,13 @@ LL | | .field = 1;
1818
| |______________^
1919

2020
error: assignment to temporary
21-
--> $DIR/temporary_assignment.rs:56:5
21+
--> $DIR/temporary_assignment.rs:57:5
2222
|
2323
LL | ArrayStruct { array: [0] }.array[0] = 1;
2424
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2525

2626
error: assignment to temporary
27-
--> $DIR/temporary_assignment.rs:58:5
27+
--> $DIR/temporary_assignment.rs:59:5
2828
|
2929
LL | (0, 0).0 = 1;
3030
| ^^^^^^^^^^^^

0 commit comments

Comments
 (0)