Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 13:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Swap assert_eq_text\!(expected, actual)

Browse source
This commit is contained in:
yugo-horie 2021-01-16 13:30:26 +09:00
parent 3782c78d75
commit f273995a25
6 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir_expand/src/proc_macro.rs
View file

@ -135,7 +135,6 @@ mod tests {
let result = format!("{:#?}", remove_derive_attrs(&tt).unwrap()); let result = format!("{:#?}", remove_derive_attrs(&tt).unwrap());
assert_eq_text!( assert_eq_text!(
&result,
r#" r#"
SUBTREE $ SUBTREE $
PUNCH # [alone] 0 PUNCH # [alone] 0
@ -150,7 +149,8 @@ SUBTREE $
PUNCH : [alone] 19 PUNCH : [alone] 19
IDENT u32 20 IDENT u32 20
"# "#
.trim() .trim(),
&result
); );
} }
} }

28
crates/ide/src/syntax_tree.rs
View file

@ -111,7 +111,6 @@ mod tests {
let syn = analysis.syntax_tree(file_id, None).unwrap(); let syn = analysis.syntax_tree(file_id, None).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
SOURCE_FILE@0..11 SOURCE_FILE@0..11
FN@0..11 FN@0..11
@ -127,7 +126,8 @@ SOURCE_FILE@0..11
L_CURLY@9..10 "{" L_CURLY@9..10 "{"
R_CURLY@10..11 "}" R_CURLY@10..11 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
let (analysis, file_id) = fixture::file( let (analysis, file_id) = fixture::file(
@ -143,7 +143,6 @@ fn test() {
let syn = analysis.syntax_tree(file_id, None).unwrap(); let syn = analysis.syntax_tree(file_id, None).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
SOURCE_FILE@0..60 SOURCE_FILE@0..60
FN@0..60 FN@0..60
@ -176,7 +175,8 @@ SOURCE_FILE@0..60
WHITESPACE@58..59 "\n" WHITESPACE@58..59 "\n"
R_CURLY@59..60 "}" R_CURLY@59..60 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
} }
@ -186,7 +186,6 @@ SOURCE_FILE@0..60
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
FN@0..11 FN@0..11
FN_KW@0..2 "fn" FN_KW@0..2 "fn"
@ -201,7 +200,8 @@ FN@0..11
L_CURLY@9..10 "{" L_CURLY@9..10 "{"
R_CURLY@10..11 "}" R_CURLY@10..11 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
let (analysis, range) = fixture::range( let (analysis, range) = fixture::range(
@ -216,7 +216,6 @@ FN@0..11
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
EXPR_STMT@16..58 EXPR_STMT@16..58
MACRO_CALL@16..57 MACRO_CALL@16..57
@ -234,7 +233,8 @@ EXPR_STMT@16..58
R_PAREN@56..57 ")" R_PAREN@56..57 ")"
SEMICOLON@57..58 ";" SEMICOLON@57..58 ";"
"# "#
.trim() .trim(),
syn.trim()
); );
} }
@ -253,7 +253,6 @@ fn bar() {
); );
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
SOURCE_FILE@0..12 SOURCE_FILE@0..12
FN@0..12 FN@0..12
@ -270,7 +269,8 @@ SOURCE_FILE@0..12
WHITESPACE@10..11 "\n" WHITESPACE@10..11 "\n"
R_CURLY@11..12 "}" R_CURLY@11..12 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
// With a raw string // With a raw string
@ -287,7 +287,6 @@ fn bar() {
); );
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
SOURCE_FILE@0..12 SOURCE_FILE@0..12
FN@0..12 FN@0..12
@ -304,7 +303,8 @@ SOURCE_FILE@0..12
WHITESPACE@10..11 "\n" WHITESPACE@10..11 "\n"
R_CURLY@11..12 "}" R_CURLY@11..12 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
// With a raw string // With a raw string
@ -320,7 +320,6 @@ fn bar() {
); );
let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap(); let syn = analysis.syntax_tree(range.file_id, Some(range.range)).unwrap();
assert_eq_text!( assert_eq_text!(
syn.trim(),
r#" r#"
SOURCE_FILE@0..25 SOURCE_FILE@0..25
FN@0..12 FN@0..12
@ -351,7 +350,8 @@ SOURCE_FILE@0..25
WHITESPACE@23..24 "\n" WHITESPACE@23..24 "\n"
R_CURLY@24..25 "}" R_CURLY@24..25 "}"
"# "#
.trim() .trim(),
syn.trim()
); );
} }
} }

2
crates/ide_db/src/helpers/insert_use/tests.rs
View file

@ -599,7 +599,7 @@ fn check(
let rewriter = insert_use(&file, path, mb); let rewriter = insert_use(&file, path, mb);
let result = rewriter.rewrite(file.as_syntax_node()).to_string(); let result = rewriter.rewrite(file.as_syntax_node()).to_string();
assert_eq_text!(&result, ra_fixture_after); assert_eq_text!(ra_fixture_after, &result);
} }
fn check_full(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) { fn check_full(path: &str, ra_fixture_before: &str, ra_fixture_after: &str) {

10
crates/mbe/src/tests.rs
View file

@ -261,7 +261,6 @@ fn test_expr_order() {
let dump = format!("{:#?}", expanded); let dump = format!("{:#?}", expanded);
assert_eq_text!( assert_eq_text!(
dump.trim(),
r#"MACRO_ITEMS@0..15 r#"MACRO_ITEMS@0..15
FN@0..15 FN@0..15
FN_KW@0..2 "fn" FN_KW@0..2 "fn"
@ -285,6 +284,7 @@ fn test_expr_order() {
INT_NUMBER@12..13 "2" INT_NUMBER@12..13 "2"
SEMICOLON@13..14 ";" SEMICOLON@13..14 ";"
R_CURLY@14..15 "}""#, R_CURLY@14..15 "}""#,
dump.trim()
); );
} }
@ -989,7 +989,6 @@ fn test_tt_composite2() {
let res = format!("{:#?}", &node); let res = format!("{:#?}", &node);
assert_eq_text!( assert_eq_text!(
res.trim(),
r###"MACRO_ITEMS@0..10 r###"MACRO_ITEMS@0..10
MACRO_CALL@0..10 MACRO_CALL@0..10
PATH@0..3 PATH@0..3
@ -1003,7 +1002,8 @@ fn test_tt_composite2() {
R_ANGLE@6..7 ">" R_ANGLE@6..7 ">"
WHITESPACE@7..8 " " WHITESPACE@7..8 " "
POUND@8..9 "#" POUND@8..9 "#"
R_PAREN@9..10 ")""### R_PAREN@9..10 ")""###,
res.trim()
); );
} }
@ -1742,7 +1742,7 @@ impl MacroFixture {
fn assert_expand(&self, invocation: &str, expected: &str) { fn assert_expand(&self, invocation: &str, expected: &str) {
let expansion = self.expand_tt(invocation); let expansion = self.expand_tt(invocation);
let actual = format!("{:?}", expansion); let actual = format!("{:?}", expansion);
test_utils::assert_eq_text!(&actual.trim(), &expected.trim()); test_utils::assert_eq_text!(&expected.trim(), &actual.trim());
} }
fn assert_expand_items(&self, invocation: &str, expected: &str) -> &MacroFixture { fn assert_expand_items(&self, invocation: &str, expected: &str) -> &MacroFixture {
@ -1941,7 +1941,6 @@ fn test_no_space_after_semi_colon() {
let dump = format!("{:#?}", expanded); let dump = format!("{:#?}", expanded);
assert_eq_text!( assert_eq_text!(
dump.trim(),
r###"MACRO_ITEMS@0..52 r###"MACRO_ITEMS@0..52
MODULE@0..26 MODULE@0..26
ATTR@0..21 ATTR@0..21
@ -1981,6 +1980,7 @@ fn test_no_space_after_semi_colon() {
NAME@50..51 NAME@50..51
IDENT@50..51 "f" IDENT@50..51 "f"
SEMICOLON@51..52 ";""###, SEMICOLON@51..52 ";""###,
dump.trim()
); );
} }

8
crates/proc_macro_srv/src/tests/mod.rs
View file

@ -38,9 +38,9 @@ fn test_derive_proc_macro_list() {
let res = list("serde_derive", "1").join("\n"); let res = list("serde_derive", "1").join("\n");
assert_eq_text!( assert_eq_text!(
&res,
r#"Serialize [CustomDerive] r#"Serialize [CustomDerive]
Deserialize [CustomDerive]"# Deserialize [CustomDerive]"#,
&res
); );
} }
@ -50,9 +50,9 @@ fn list_test_macros() {
let res = list("proc_macro_test", "0.0.0").join("\n"); let res = list("proc_macro_test", "0.0.0").join("\n");
assert_eq_text!( assert_eq_text!(
&res,
r#"function_like_macro [FuncLike] r#"function_like_macro [FuncLike]
attribute_macro [Attr] attribute_macro [Attr]
DummyTrait [CustomDerive]"# DummyTrait [CustomDerive]"#,
&res
); );
} }

2
crates/proc_macro_srv/src/tests/utils.rs
View file

@ -52,7 +52,7 @@ pub fn assert_expand(
let fixture = parse_string(ra_fixture).unwrap(); let fixture = parse_string(ra_fixture).unwrap();
let res = expander.expand(macro_name, &fixture.subtree, None).unwrap(); let res = expander.expand(macro_name, &fixture.subtree, None).unwrap();
assert_eq_text!(&format!("{:?}", res), &expect.trim()); assert_eq_text!(&expect.trim(), &format!("{:?}", res));
} }
pub fn list(crate_name: &str, version: &str) -> Vec<String> { pub fn list(crate_name: &str, version: &str) -> Vec<String> {