mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump ui_test

Browse Source
This commit is contained in:
Oli Scherer 2023-08-29 13:28:53 +00:00
parent ac25a7387c
commit 4fdb4edf9b
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock
View File

@ -531,7 +531,7 @@ dependencies = [
"tester", "tester",
"tokio", "tokio",
"toml 0.7.5", "toml 0.7.5",
"ui_test 0.17.0", "ui_test 0.18.1",
"walkdir", "walkdir",
] ]
@ -1016,12 +1016,6 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e" checksum = "210ec60ae7d710bed8683e333e9d2855a8a56a3e9892b38bad3bb0d4d29b0d5e"
[[package]]
name = "distance"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d9d8664cf849d7d0f3114a3a387d2f5e4303176d746d5a951aaddc66dfe9240"
[[package]] [[package]]
name = "dlmalloc" name = "dlmalloc"
version = "0.2.4" version = "0.2.4"
@ -2047,6 +2041,12 @@ version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "levenshtein"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.147" version = "0.2.147"
@ -5580,9 +5580,9 @@ dependencies = [
[[package]] [[package]]
name = "ui_test" name = "ui_test"
version = "0.17.0" version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7823f926a62629304c4a47c23949925f6faa0d4f14ddbce4405d55dbaeab324" checksum = "640159421816683e558867ffc0e60ed3a3ed97ec6ccb22c03adb41bf87c5cfa4"
dependencies = [ dependencies = [
"annotate-snippets", "annotate-snippets",
"anyhow", "anyhow",
@ -5593,9 +5593,9 @@ dependencies = [
"colored", "colored",
"comma", "comma",
"crossbeam-channel", "crossbeam-channel",
"distance",
"indicatif", "indicatif",
"lazy_static", "lazy_static",
"levenshtein",
"prettydiff", "prettydiff",
"regex", "regex",
"rustc_version", "rustc_version",

2
src/tools/clippy/Cargo.toml
View File

@ -27,7 +27,7 @@ tempfile = { version = "3.2", optional = true }
termize = "0.1" termize = "0.1"
[dev-dependencies] [dev-dependencies]
ui_test = "0.17.0" ui_test = "0.18.1"
tester = "0.9" tester = "0.9"
regex = "1.5" regex = "1.5"
toml = "0.7.3" toml = "0.7.3"

4
src/tools/clippy/tests/compile-test.rs
View File

@ -4,7 +4,7 @@
#![warn(rust_2018_idioms, unused_lifetimes)] #![warn(rust_2018_idioms, unused_lifetimes)]
#![allow(unused_extern_crates)] #![allow(unused_extern_crates)]
use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling}; use ui_test::{status_emitter, Args, CommandBuilder, Config, Match, Mode, OutputConflictHandling, RustfixMode};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::env::{self, set_var, var_os}; use std::env::{self, set_var, var_os};
@ -130,7 +130,7 @@ fn base_config(test_dir: &str) -> (Config, Args) {
}; };
let mut config = Config { let mut config = Config {
mode: Mode::Yolo { rustfix: true }, mode: Mode::Yolo { rustfix: RustfixMode::Everything },
stderr_filters: vec![(Match::PathBackslash, b"/")], stderr_filters: vec![(Match::PathBackslash, b"/")],
stdout_filters: vec![], stdout_filters: vec![],
output_conflict_handling: if bless { output_conflict_handling: if bless {

20
src/tools/clippy/tests/ui/derive.stderr
View File

@ -1,5 +1,5 @@
error: you are implementing `Clone` explicitly on a `Copy` type error: you are implementing `Clone` explicitly on a `Copy` type
--> $DIR/derive.rs:11:1 --> $DIR/derive.rs:12:1
| |
LL | / impl Clone for Qux { LL | / impl Clone for Qux {
LL | | LL | |
@ -10,7 +10,7 @@ LL | | }
| |_^ | |_^
| |
note: consider deriving `Clone` or removing `Copy` note: consider deriving `Clone` or removing `Copy`
--> $DIR/derive.rs:11:1 --> $DIR/derive.rs:12:1
| |
LL | / impl Clone for Qux { LL | / impl Clone for Qux {
LL | | LL | |
@ -22,7 +22,7 @@ LL | | }
= note: `-D clippy::expl-impl-clone-on-copy` implied by `-D warnings` = note: `-D clippy::expl-impl-clone-on-copy` implied by `-D warnings`
error: you are implementing `Clone` explicitly on a `Copy` type error: you are implementing `Clone` explicitly on a `Copy` type
--> $DIR/derive.rs:36:1 --> $DIR/derive.rs:37:1
| |
LL | / impl<'a> Clone for Lt<'a> { LL | / impl<'a> Clone for Lt<'a> {
LL | | LL | |
@ -33,7 +33,7 @@ LL | | }
| |_^ | |_^
| |
note: consider deriving `Clone` or removing `Copy` note: consider deriving `Clone` or removing `Copy`
--> $DIR/derive.rs:36:1 --> $DIR/derive.rs:37:1
| |
LL | / impl<'a> Clone for Lt<'a> { LL | / impl<'a> Clone for Lt<'a> {
LL | | LL | |
@ -44,7 +44,7 @@ LL | | }
| |_^ | |_^
error: you are implementing `Clone` explicitly on a `Copy` type error: you are implementing `Clone` explicitly on a `Copy` type
--> $DIR/derive.rs:48:1 --> $DIR/derive.rs:49:1
| |
LL | / impl Clone for BigArray { LL | / impl Clone for BigArray {
LL | | LL | |
@ -55,7 +55,7 @@ LL | | }
| |_^ | |_^
| |
note: consider deriving `Clone` or removing `Copy` note: consider deriving `Clone` or removing `Copy`
--> $DIR/derive.rs:48:1 --> $DIR/derive.rs:49:1
| |
LL | / impl Clone for BigArray { LL | / impl Clone for BigArray {
LL | | LL | |
@ -66,7 +66,7 @@ LL | | }
| |_^ | |_^
error: you are implementing `Clone` explicitly on a `Copy` type error: you are implementing `Clone` explicitly on a `Copy` type
--> $DIR/derive.rs:60:1 --> $DIR/derive.rs:61:1
| |
LL | / impl Clone for FnPtr { LL | / impl Clone for FnPtr {
LL | | LL | |
@ -77,7 +77,7 @@ LL | | }
| |_^ | |_^
| |
note: consider deriving `Clone` or removing `Copy` note: consider deriving `Clone` or removing `Copy`
--> $DIR/derive.rs:60:1 --> $DIR/derive.rs:61:1
| |
LL | / impl Clone for FnPtr { LL | / impl Clone for FnPtr {
LL | | LL | |
@ -88,7 +88,7 @@ LL | | }
| |_^ | |_^
error: you are implementing `Clone` explicitly on a `Copy` type error: you are implementing `Clone` explicitly on a `Copy` type
--> $DIR/derive.rs:81:1 --> $DIR/derive.rs:82:1
| |
LL | / impl<T: Clone> Clone for Generic2<T> { LL | / impl<T: Clone> Clone for Generic2<T> {
LL | | LL | |
@ -99,7 +99,7 @@ LL | | }
| |_^ | |_^
| |
note: consider deriving `Clone` or removing `Copy` note: consider deriving `Clone` or removing `Copy`
--> $DIR/derive.rs:81:1 --> $DIR/derive.rs:82:1
| |
LL | / impl<T: Clone> Clone for Generic2<T> { LL | / impl<T: Clone> Clone for Generic2<T> {
LL | | LL | |

8
src/tools/clippy/tests/ui/temporary_assignment.stderr
View File

@ -1,5 +1,5 @@
error: assignment to temporary error: assignment to temporary
--> $DIR/temporary_assignment.rs:47:5 --> $DIR/temporary_assignment.rs:48:5
| |
LL | Struct { field: 0 }.field = 1; LL | Struct { field: 0 }.field = 1;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -7,7 +7,7 @@ LL | Struct { field: 0 }.field = 1;
= note: `-D clippy::temporary-assignment` implied by `-D warnings` = note: `-D clippy::temporary-assignment` implied by `-D warnings`
error: assignment to temporary error: assignment to temporary
--> $DIR/temporary_assignment.rs:50:5 --> $DIR/temporary_assignment.rs:51:5
| |
LL | / MultiStruct { LL | / MultiStruct {
LL | | LL | |
@ -18,13 +18,13 @@ LL | | .field = 1;
| |______________^ | |______________^
error: assignment to temporary error: assignment to temporary
--> $DIR/temporary_assignment.rs:56:5 --> $DIR/temporary_assignment.rs:57:5
| |
LL | ArrayStruct { array: [0] }.array[0] = 1; LL | ArrayStruct { array: [0] }.array[0] = 1;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: assignment to temporary error: assignment to temporary
--> $DIR/temporary_assignment.rs:58:5 --> $DIR/temporary_assignment.rs:59:5
| |
LL | (0, 0).0 = 1; LL | (0, 0).0 = 1;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^