git.iko.soy/helix
on master help sign in
Remove usage of format ident feature from tests (#2028)
19ff21eMichael Davis
helix-core/src/movement.rs+6−6
compare with master
unifiedsplit
@@ -1293,7 +1293,7 @@ mod test {
1293 let selection =
1293 let selection =
1294 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));
1294 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));
1295 let actual = crate::test::plain(&s, selection);
1295 let actual = crate::test::plain(&s, selection);
1296− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1296+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1297 }
1297 }
1298 }
1298 }
1299
1299
@@ -1316,7 +1316,7 @@ mod test {
1316 let selection =
1316 let selection =
1317 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));
1317 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));
1318 let actual = crate::test::plain(&s, selection);
1318 let actual = crate::test::plain(&s, selection);
1319− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1319+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1320 }
1320 }
1321 }
1321 }
1322
1322
@@ -1339,7 +1339,7 @@ mod test {
1339 let selection = selection
1339 let selection = selection
1340 .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));
1340 .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));
1341 let actual = crate::test::plain(&s, selection);
1341 let actual = crate::test::plain(&s, selection);
1342− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1342+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1343 }
1343 }
1344 }
1344 }
1345
1345
@@ -1381,7 +1381,7 @@ mod test {
1381 let selection =
1381 let selection =
1382 selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));
1382 selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));
1383 let actual = crate::test::plain(&s, selection);
1383 let actual = crate::test::plain(&s, selection);
1384− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1384+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1385 }
1385 }
1386 }
1386 }
1387
1387
@@ -1404,7 +1404,7 @@ mod test {
1404 let selection =
1404 let selection =
1405 selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));
1405 selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));
1406 let actual = crate::test::plain(&s, selection);
1406 let actual = crate::test::plain(&s, selection);
1407− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1407+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1408 }
1408 }
1409 }
1409 }
1410
1410
@@ -1427,7 +1427,7 @@ mod test {
1427 let selection = selection
1427 let selection = selection
1428 .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));
1428 .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));
1429 let actual = crate::test::plain(&s, selection);
1429 let actual = crate::test::plain(&s, selection);
1430− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
1430+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
1431 }
1431 }
1432 }
1432 }
1433}
1433}
helix-core/src/syntax.rs+3−1
@@ -1996,7 +1996,9 @@ mod test {
1996 assert_eq!(
1996 assert_eq!(
1997 matches[0].byte_range(),
1997 matches[0].byte_range(),
1998 range,
1998 range,
1999− "@{capture} expected {range:?}"
1999+ "@{} expected {:?}",
2000+ capture,
2001+ range
2000 )
2002 )
2001 };
2003 };
2002
2004
helix-core/src/test.rs+4−4
@@ -53,7 +53,7 @@ pub fn print(s: &str) -> (String, Selection) {
53 };
53 };
54
54
55 if is_primary && primary_idx.is_some() {
55 if is_primary && primary_idx.is_some() {
56− panic!("primary `#[` already appeared {left:?} {s:?}");
56+ panic!("primary `#[` already appeared {:?} {:?}", left, s);
57 }
57 }
58
58
59 let head_at_beg = iter.next_if_eq(&'|').is_some();
59 let head_at_beg = iter.next_if_eq(&'|').is_some();
@@ -85,15 +85,15 @@ pub fn print(s: &str) -> (String, Selection) {
85 }
85 }
86
86
87 if head_at_beg {
87 if head_at_beg {
88− panic!("missing end `{close_pair}#` {left:?} {s:?}");
88+ panic!("missing end `{}#` {:?} {:?}", close_pair, left, s);
89 } else {
89 } else {
90− panic!("missing end `|{close_pair}#` {left:?} {s:?}");
90+ panic!("missing end `|{}#` {:?} {:?}", close_pair, left, s);
91 }
91 }
92 }
92 }
93
93
94 let primary = match primary_idx {
94 let primary = match primary_idx {
95 Some(i) => i,
95 Some(i) => i,
96− None => panic!("missing primary `#[|]#` {s:?}"),
96+ None => panic!("missing primary `#[|]#` {:?}", s),
97 };
97 };
98 let selection = Selection::new(ranges, primary);
98 let selection = Selection::new(ranges, primary);
99 (left, selection)
99 (left, selection)
helix-core/src/textobject.rs+3−3
@@ -381,7 +381,7 @@ mod test {
381 let selection = selection
381 let selection = selection
382 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 1));
382 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 1));
383 let actual = crate::test::plain(&s, selection);
383 let actual = crate::test::plain(&s, selection);
384− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
384+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
385 }
385 }
386 }
386 }
387
387
@@ -404,7 +404,7 @@ mod test {
404 let selection = selection
404 let selection = selection
405 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 2));
405 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 2));
406 let actual = crate::test::plain(&s, selection);
406 let actual = crate::test::plain(&s, selection);
407− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
407+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
408 }
408 }
409 }
409 }
410
410
@@ -435,7 +435,7 @@ mod test {
435 let selection = selection
435 let selection = selection
436 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Around, 1));
436 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Around, 1));
437 let actual = crate::test::plain(&s, selection);
437 let actual = crate::test::plain(&s, selection);
438− assert_eq!(actual, expected, "\nbefore: `{before:?}`");
438+ assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
439 }
439 }
440 }
440 }
441
441