diff options
-rw-r--r-- | Cargo.lock | 4 | ||||
-rw-r--r-- | crates/hir_def/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/hir_ty/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ide/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html (renamed from crates/ide/test_data/highlight_doctest.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html (renamed from crates/ide/test_data/highlight_extern_crate.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_injection.html (renamed from crates/ide/test_data/highlight_injection.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_strings.html (renamed from crates/ide/test_data/highlight_strings.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html (renamed from crates/ide/test_data/highlight_unsafe.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/highlighting.html (renamed from crates/ide/test_data/highlighting.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html (renamed from crates/ide/test_data/rainbow_highlighting.html) | 0 | ||||
-rw-r--r-- | crates/ide/src/syntax_highlighting/tests.rs | 14 | ||||
-rw-r--r-- | crates/rust-analyzer/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt (renamed from crates/rust-analyzer/test_data/clippy_pass_by_ref.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt (renamed from crates/rust-analyzer/test_data/handles_macro_location.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt (renamed from crates/rust-analyzer/test_data/macro_compiler_error.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt (renamed from crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt (renamed from crates/rust-analyzer/test_data/rustc_mismatched_type.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt (renamed from crates/rust-analyzer/test_data/rustc_unused_variable.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt (renamed from crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt (renamed from crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt (renamed from crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt (renamed from crates/rust-analyzer/test_data/snap_multi_line_fix.txt) | 0 | ||||
-rw-r--r-- | crates/rust-analyzer/src/diagnostics/to_proto.rs | 20 | ||||
-rw-r--r-- | crates/ssr/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/syntax/Cargo.toml | 2 |
26 files changed, 25 insertions, 25 deletions
diff --git a/Cargo.lock b/Cargo.lock index f406a5ef9..867a6c1dc 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -335,9 +335,9 @@ dependencies = [ | |||
335 | 335 | ||
336 | [[package]] | 336 | [[package]] |
337 | name = "expect-test" | 337 | name = "expect-test" |
338 | version = "0.1.0" | 338 | version = "1.0.0" |
339 | source = "registry+https://github.com/rust-lang/crates.io-index" | 339 | source = "registry+https://github.com/rust-lang/crates.io-index" |
340 | checksum = "a3e383741ea1982866572109d1a8c807bd36aad91fca701489fdca56ef92b3b8" | 340 | checksum = "3a3cb2ab12988de61df699d210428f3a0e26907b9d0978cf2c12e65ee90adb1d" |
341 | dependencies = [ | 341 | dependencies = [ |
342 | "difference", | 342 | "difference", |
343 | "once_cell", | 343 | "once_cell", |
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml index 011e4612c..a88b5f57e 100644 --- a/crates/hir_def/Cargo.toml +++ b/crates/hir_def/Cargo.toml | |||
@@ -33,4 +33,4 @@ cfg = { path = "../cfg", version = "0.0.0" } | |||
33 | tt = { path = "../tt", version = "0.0.0" } | 33 | tt = { path = "../tt", version = "0.0.0" } |
34 | 34 | ||
35 | [dev-dependencies] | 35 | [dev-dependencies] |
36 | expect-test = "0.1" | 36 | expect-test = "1.0" |
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index 33e155a70..47940c36e 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml | |||
@@ -31,7 +31,7 @@ syntax = { path = "../syntax", version = "0.0.0" } | |||
31 | test_utils = { path = "../test_utils", version = "0.0.0" } | 31 | test_utils = { path = "../test_utils", version = "0.0.0" } |
32 | 32 | ||
33 | [dev-dependencies] | 33 | [dev-dependencies] |
34 | expect-test = "0.1" | 34 | expect-test = "1.0" |
35 | tracing = "0.1" | 35 | tracing = "0.1" |
36 | tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] } | 36 | tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] } |
37 | tracing-tree = { version = "0.1.4" } | 37 | tracing-tree = { version = "0.1.4" } |
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml index a15f704ca..f0257403d 100644 --- a/crates/ide/Cargo.toml +++ b/crates/ide/Cargo.toml | |||
@@ -36,4 +36,4 @@ ssr = { path = "../ssr", version = "0.0.0" } | |||
36 | hir = { path = "../hir", version = "0.0.0" } | 36 | hir = { path = "../hir", version = "0.0.0" } |
37 | 37 | ||
38 | [dev-dependencies] | 38 | [dev-dependencies] |
39 | expect-test = "0.1" | 39 | expect-test = "1.0" |
diff --git a/crates/ide/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html index 6322d404f..6322d404f 100644 --- a/crates/ide/test_data/highlight_doctest.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html | |||
diff --git a/crates/ide/test_data/highlight_extern_crate.html b/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html index 800d894c7..800d894c7 100644 --- a/crates/ide/test_data/highlight_extern_crate.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html | |||
diff --git a/crates/ide/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html index 18addd00d..18addd00d 100644 --- a/crates/ide/test_data/highlight_injection.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html | |||
diff --git a/crates/ide/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html index 1b681b2c6..1b681b2c6 100644 --- a/crates/ide/test_data/highlight_strings.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html | |||
diff --git a/crates/ide/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html index 552fea668..552fea668 100644 --- a/crates/ide/test_data/highlight_unsafe.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html | |||
diff --git a/crates/ide/test_data/highlighting.html b/crates/ide/src/syntax_highlighting/test_data/highlighting.html index d0df2e0ec..d0df2e0ec 100644 --- a/crates/ide/test_data/highlighting.html +++ b/crates/ide/src/syntax_highlighting/test_data/highlighting.html | |||
diff --git a/crates/ide/test_data/rainbow_highlighting.html b/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html index 401e87a73..401e87a73 100644 --- a/crates/ide/test_data/rainbow_highlighting.html +++ b/crates/ide/src/syntax_highlighting/test_data/rainbow_highlighting.html | |||
diff --git a/crates/ide/src/syntax_highlighting/tests.rs b/crates/ide/src/syntax_highlighting/tests.rs index 1c3fea058..6f72a29bd 100644 --- a/crates/ide/src/syntax_highlighting/tests.rs +++ b/crates/ide/src/syntax_highlighting/tests.rs | |||
@@ -144,7 +144,7 @@ impl<T> Option<T> { | |||
144 | } | 144 | } |
145 | "# | 145 | "# |
146 | .trim(), | 146 | .trim(), |
147 | expect_file!["crates/ide/test_data/highlighting.html"], | 147 | expect_file!["./test_data/highlighting.html"], |
148 | false, | 148 | false, |
149 | ); | 149 | ); |
150 | } | 150 | } |
@@ -167,7 +167,7 @@ fn bar() { | |||
167 | } | 167 | } |
168 | "# | 168 | "# |
169 | .trim(), | 169 | .trim(), |
170 | expect_file!["crates/ide/test_data/rainbow_highlighting.html"], | 170 | expect_file!["./test_data/rainbow_highlighting.html"], |
171 | true, | 171 | true, |
172 | ); | 172 | ); |
173 | } | 173 | } |
@@ -220,7 +220,7 @@ fn main() { | |||
220 | ); | 220 | ); |
221 | }"## | 221 | }"## |
222 | .trim(), | 222 | .trim(), |
223 | expect_file!["crates/ide/test_data/highlight_injection.html"], | 223 | expect_file!["./test_data/highlight_injection.html"], |
224 | false, | 224 | false, |
225 | ); | 225 | ); |
226 | } | 226 | } |
@@ -303,7 +303,7 @@ fn main() { | |||
303 | println!("{ничоси}", ничоси = 92); | 303 | println!("{ничоси}", ничоси = 92); |
304 | }"# | 304 | }"# |
305 | .trim(), | 305 | .trim(), |
306 | expect_file!["crates/ide/test_data/highlight_strings.html"], | 306 | expect_file!["./test_data/highlight_strings.html"], |
307 | false, | 307 | false, |
308 | ); | 308 | ); |
309 | } | 309 | } |
@@ -376,7 +376,7 @@ fn main() { | |||
376 | } | 376 | } |
377 | "# | 377 | "# |
378 | .trim(), | 378 | .trim(), |
379 | expect_file!["crates/ide/test_data/highlight_unsafe.html"], | 379 | expect_file!["./test_data/highlight_unsafe.html"], |
380 | false, | 380 | false, |
381 | ); | 381 | ); |
382 | } | 382 | } |
@@ -452,7 +452,7 @@ macro_rules! noop { | |||
452 | } | 452 | } |
453 | "# | 453 | "# |
454 | .trim(), | 454 | .trim(), |
455 | expect_file!["crates/ide/test_data/highlight_doctest.html"], | 455 | expect_file!["./test_data/highlight_doctest.html"], |
456 | false, | 456 | false, |
457 | ); | 457 | ); |
458 | } | 458 | } |
@@ -469,7 +469,7 @@ fn test_extern_crate() { | |||
469 | //- /alloc/lib.rs | 469 | //- /alloc/lib.rs |
470 | pub struct A | 470 | pub struct A |
471 | "#, | 471 | "#, |
472 | expect_file!["crates/ide/test_data/highlight_extern_crate.html"], | 472 | expect_file!["./test_data/highlight_extern_crate.html"], |
473 | false, | 473 | false, |
474 | ); | 474 | ); |
475 | } | 475 | } |
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 044686a99..e06956d6c 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml | |||
@@ -58,7 +58,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" } | |||
58 | winapi = "0.3.8" | 58 | winapi = "0.3.8" |
59 | 59 | ||
60 | [dev-dependencies] | 60 | [dev-dependencies] |
61 | expect-test = "0.1" | 61 | expect-test = "1.0" |
62 | test_utils = { path = "../test_utils" } | 62 | test_utils = { path = "../test_utils" } |
63 | mbe = { path = "../mbe" } | 63 | mbe = { path = "../mbe" } |
64 | tt = { path = "../tt" } | 64 | tt = { path = "../tt" } |
diff --git a/crates/rust-analyzer/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt index d06517126..d06517126 100644 --- a/crates/rust-analyzer/test_data/clippy_pass_by_ref.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt | |||
diff --git a/crates/rust-analyzer/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt index f5de2f07f..f5de2f07f 100644 --- a/crates/rust-analyzer/test_data/handles_macro_location.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt | |||
diff --git a/crates/rust-analyzer/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt index 89dae7d5a..89dae7d5a 100644 --- a/crates/rust-analyzer/test_data/macro_compiler_error.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt index fc54440be..fc54440be 100644 --- a/crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt index c269af218..c269af218 100644 --- a/crates/rust-analyzer/test_data/rustc_mismatched_type.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt index 74d91bc77..74d91bc77 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt index 8a420c949..8a420c949 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt index 79910660b..79910660b 100644 --- a/crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt | |||
diff --git a/crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt index efe37261d..efe37261d 100644 --- a/crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt | |||
diff --git a/crates/rust-analyzer/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt index 4f811ab64..4f811ab64 100644 --- a/crates/rust-analyzer/test_data/snap_multi_line_fix.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt | |||
diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs index e52b97913..f69a949f2 100644 --- a/crates/rust-analyzer/src/diagnostics/to_proto.rs +++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs | |||
@@ -315,7 +315,7 @@ mod tests { | |||
315 | "rendered": "error[E0053]: method `next` has an incompatible type for trait\n --> compiler/ty/list_iter.rs:52:5\n |\n52 | fn next(&self) -> Option<&'list ty::Ref<M>> {\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability\n |\n = note: expected type `fn(&mut ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&ty::Ref<M>>`\n found type `fn(&ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&'list ty::Ref<M>>`\n\n" | 315 | "rendered": "error[E0053]: method `next` has an incompatible type for trait\n --> compiler/ty/list_iter.rs:52:5\n |\n52 | fn next(&self) -> Option<&'list ty::Ref<M>> {\n | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ types differ in mutability\n |\n = note: expected type `fn(&mut ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&ty::Ref<M>>`\n found type `fn(&ty::list_iter::ListIterator<'list, M>) -> std::option::Option<&'list ty::Ref<M>>`\n\n" |
316 | } | 316 | } |
317 | "##, | 317 | "##, |
318 | expect_file!["crates/rust-analyzer/test_data/rustc_incompatible_type_for_trait.txt"], | 318 | expect_file!["./test_data/rustc_incompatible_type_for_trait.txt"], |
319 | ); | 319 | ); |
320 | } | 320 | } |
321 | 321 | ||
@@ -394,7 +394,7 @@ mod tests { | |||
394 | ], | 394 | ], |
395 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" | 395 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" |
396 | }"##, | 396 | }"##, |
397 | expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable.txt"], | 397 | expect_file!["./test_data/rustc_unused_variable.txt"], |
398 | ); | 398 | ); |
399 | } | 399 | } |
400 | 400 | ||
@@ -478,7 +478,7 @@ mod tests { | |||
478 | ], | 478 | ], |
479 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" | 479 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" |
480 | }"##, | 480 | }"##, |
481 | expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable_as_info.txt"], | 481 | expect_file!["./test_data/rustc_unused_variable_as_info.txt"], |
482 | ); | 482 | ); |
483 | } | 483 | } |
484 | 484 | ||
@@ -562,7 +562,7 @@ mod tests { | |||
562 | ], | 562 | ], |
563 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" | 563 | "rendered": "warning: unused variable: `foo`\n --> driver/subcommand/repl.rs:291:9\n |\n291 | let foo = 42;\n | ^^^ help: consider prefixing with an underscore: `_foo`\n |\n = note: #[warn(unused_variables)] on by default\n\n" |
564 | }"##, | 564 | }"##, |
565 | expect_file!["crates/rust-analyzer/test_data/rustc_unused_variable_as_hint.txt"], | 565 | expect_file!["./test_data/rustc_unused_variable_as_hint.txt"], |
566 | ); | 566 | ); |
567 | } | 567 | } |
568 | 568 | ||
@@ -683,7 +683,7 @@ mod tests { | |||
683 | "children": [], | 683 | "children": [], |
684 | "rendered": "error[E0061]: this function takes 2 parameters but 3 parameters were supplied\n --> compiler/ty/select.rs:104:18\n |\n104 | self.add_evidence(target_fixed, evidence_fixed, false);\n | ^^^^^^^^^^^^ expected 2 parameters\n...\n219 | / pub fn add_evidence(\n220 | | &mut self,\n221 | | target_poly: &ty::Ref<ty::Poly>,\n222 | | evidence_poly: &ty::Ref<ty::Poly>,\n... |\n230 | | }\n231 | | }\n | |_____- defined here\n\n" | 684 | "rendered": "error[E0061]: this function takes 2 parameters but 3 parameters were supplied\n --> compiler/ty/select.rs:104:18\n |\n104 | self.add_evidence(target_fixed, evidence_fixed, false);\n | ^^^^^^^^^^^^ expected 2 parameters\n...\n219 | / pub fn add_evidence(\n220 | | &mut self,\n221 | | target_poly: &ty::Ref<ty::Poly>,\n222 | | evidence_poly: &ty::Ref<ty::Poly>,\n... |\n230 | | }\n231 | | }\n | |_____- defined here\n\n" |
685 | }"##, | 685 | }"##, |
686 | expect_file!["crates/rust-analyzer/test_data/rustc_wrong_number_of_parameters.txt"], | 686 | expect_file!["./test_data/rustc_wrong_number_of_parameters.txt"], |
687 | ); | 687 | ); |
688 | } | 688 | } |
689 | 689 | ||
@@ -800,7 +800,7 @@ mod tests { | |||
800 | ], | 800 | ], |
801 | "rendered": "warning: this argument is passed by reference, but would be more efficient if passed by value\n --> compiler/mir/tagset.rs:42:24\n |\n42 | pub fn is_disjoint(&self, other: Self) -> bool {\n | ^^^^^ help: consider passing by value instead: `self`\n |\nnote: lint level defined here\n --> compiler/lib.rs:1:9\n |\n1 | #![warn(clippy::all)]\n | ^^^^^^^^^^^\n = note: #[warn(clippy::trivially_copy_pass_by_ref)] implied by #[warn(clippy::all)]\n = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref\n\n" | 801 | "rendered": "warning: this argument is passed by reference, but would be more efficient if passed by value\n --> compiler/mir/tagset.rs:42:24\n |\n42 | pub fn is_disjoint(&self, other: Self) -> bool {\n | ^^^^^ help: consider passing by value instead: `self`\n |\nnote: lint level defined here\n --> compiler/lib.rs:1:9\n |\n1 | #![warn(clippy::all)]\n | ^^^^^^^^^^^\n = note: #[warn(clippy::trivially_copy_pass_by_ref)] implied by #[warn(clippy::all)]\n = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#trivially_copy_pass_by_ref\n\n" |
802 | }"##, | 802 | }"##, |
803 | expect_file!["crates/rust-analyzer/test_data/clippy_pass_by_ref.txt"], | 803 | expect_file!["./test_data/clippy_pass_by_ref.txt"], |
804 | ); | 804 | ); |
805 | } | 805 | } |
806 | 806 | ||
@@ -840,7 +840,7 @@ mod tests { | |||
840 | "children": [], | 840 | "children": [], |
841 | "rendered": "error[E0308]: mismatched types\n --> runtime/compiler_support.rs:48:65\n |\n48 | let layout = alloc::Layout::from_size_align_unchecked(size, align);\n | ^^^^^ expected usize, found u32\n\n" | 841 | "rendered": "error[E0308]: mismatched types\n --> runtime/compiler_support.rs:48:65\n |\n48 | let layout = alloc::Layout::from_size_align_unchecked(size, align);\n | ^^^^^ expected usize, found u32\n\n" |
842 | }"##, | 842 | }"##, |
843 | expect_file!["crates/rust-analyzer/test_data/rustc_mismatched_type.txt"], | 843 | expect_file!["./test_data/rustc_mismatched_type.txt"], |
844 | ); | 844 | ); |
845 | } | 845 | } |
846 | 846 | ||
@@ -1108,7 +1108,7 @@ mod tests { | |||
1108 | } | 1108 | } |
1109 | ] | 1109 | ] |
1110 | }"##, | 1110 | }"##, |
1111 | expect_file!["crates/rust-analyzer/test_data/handles_macro_location.txt"], | 1111 | expect_file!["./test_data/handles_macro_location.txt"], |
1112 | ); | 1112 | ); |
1113 | } | 1113 | } |
1114 | 1114 | ||
@@ -1334,7 +1334,7 @@ mod tests { | |||
1334 | ] | 1334 | ] |
1335 | } | 1335 | } |
1336 | "##, | 1336 | "##, |
1337 | expect_file!["crates/rust-analyzer/test_data/macro_compiler_error.txt"], | 1337 | expect_file!["./test_data/macro_compiler_error.txt"], |
1338 | ); | 1338 | ); |
1339 | } | 1339 | } |
1340 | 1340 | ||
@@ -1464,7 +1464,7 @@ mod tests { | |||
1464 | ] | 1464 | ] |
1465 | } | 1465 | } |
1466 | "##, | 1466 | "##, |
1467 | expect_file!["crates/rust-analyzer/test_data/snap_multi_line_fix.txt"], | 1467 | expect_file!["./test_data/snap_multi_line_fix.txt"], |
1468 | ); | 1468 | ); |
1469 | } | 1469 | } |
1470 | } | 1470 | } |
diff --git a/crates/ssr/Cargo.toml b/crates/ssr/Cargo.toml index 6f0f53d70..408140014 100644 --- a/crates/ssr/Cargo.toml +++ b/crates/ssr/Cargo.toml | |||
@@ -22,4 +22,4 @@ hir = { path = "../hir", version = "0.0.0" } | |||
22 | test_utils = { path = "../test_utils", version = "0.0.0" } | 22 | test_utils = { path = "../test_utils", version = "0.0.0" } |
23 | 23 | ||
24 | [dev-dependencies] | 24 | [dev-dependencies] |
25 | expect-test = "0.1" | 25 | expect-test = "1.0" |
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 2c1bdb295..af61bb658 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml | |||
@@ -30,6 +30,6 @@ parser = { path = "../parser", version = "0.0.0" } | |||
30 | [dev-dependencies] | 30 | [dev-dependencies] |
31 | walkdir = "2.3.1" | 31 | walkdir = "2.3.1" |
32 | rayon = "1" | 32 | rayon = "1" |
33 | expect-test = "0.1" | 33 | expect-test = "1.0" |
34 | 34 | ||
35 | test_utils = { path = "../test_utils" } | 35 | test_utils = { path = "../test_utils" } |