diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-10-02 16:50:20 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-10-02 16:50:20 +0100 |
commit | 673e1ddb9ae12c565f966549ba7ea8c306cfba87 (patch) | |
tree | a1d9c304711806c393163547fe6da69289aa9f16 /crates/ide/src/inlay_hints.rs | |
parent | a360832c95dbfe10167ebebe4978760e9be6a4bd (diff) | |
parent | b06259673f9b535a63c0cabf4eeb935ff73d86d0 (diff) |
Merge #6123
6123: Reduce duplication in fixtures r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide/src/inlay_hints.rs')
-rw-r--r-- | crates/ide/src/inlay_hints.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs index 583f39d85..0afe5f8fd 100644 --- a/crates/ide/src/inlay_hints.rs +++ b/crates/ide/src/inlay_hints.rs | |||
@@ -339,14 +339,14 @@ mod tests { | |||
339 | use expect_test::{expect, Expect}; | 339 | use expect_test::{expect, Expect}; |
340 | use test_utils::extract_annotations; | 340 | use test_utils::extract_annotations; |
341 | 341 | ||
342 | use crate::{inlay_hints::InlayHintsConfig, mock_analysis::single_file}; | 342 | use crate::{fixture, inlay_hints::InlayHintsConfig}; |
343 | 343 | ||
344 | fn check(ra_fixture: &str) { | 344 | fn check(ra_fixture: &str) { |
345 | check_with_config(InlayHintsConfig::default(), ra_fixture); | 345 | check_with_config(InlayHintsConfig::default(), ra_fixture); |
346 | } | 346 | } |
347 | 347 | ||
348 | fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) { | 348 | fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) { |
349 | let (analysis, file_id) = single_file(ra_fixture); | 349 | let (analysis, file_id) = fixture::file(ra_fixture); |
350 | let expected = extract_annotations(&*analysis.file_text(file_id).unwrap()); | 350 | let expected = extract_annotations(&*analysis.file_text(file_id).unwrap()); |
351 | let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap(); | 351 | let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap(); |
352 | let actual = | 352 | let actual = |
@@ -355,7 +355,7 @@ mod tests { | |||
355 | } | 355 | } |
356 | 356 | ||
357 | fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) { | 357 | fn check_expect(config: InlayHintsConfig, ra_fixture: &str, expect: Expect) { |
358 | let (analysis, file_id) = single_file(ra_fixture); | 358 | let (analysis, file_id) = fixture::file(ra_fixture); |
359 | let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap(); | 359 | let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap(); |
360 | expect.assert_debug_eq(&inlay_hints) | 360 | expect.assert_debug_eq(&inlay_hints) |
361 | } | 361 | } |