diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs index e695bf944..f60b3c83f 100644 --- a/helix-core/src/movement.rs +++ b/helix-core/src/movement.rs @@ -1293,7 +1293,7 @@ fn test_behaviour_when_moving_to_prev_paragraph_single() { let selection = selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -1316,7 +1316,7 @@ fn test_behaviour_when_moving_to_prev_paragraph_double() { let selection = selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -1339,7 +1339,7 @@ fn test_behaviour_when_moving_to_prev_paragraph_extend() { let selection = selection .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -1381,7 +1381,7 @@ fn test_behaviour_when_moving_to_next_paragraph_single() { let selection = selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -1404,7 +1404,7 @@ fn test_behaviour_when_moving_to_next_paragraph_double() { let selection = selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -1427,7 +1427,7 @@ fn test_behaviour_when_moving_to_next_paragraph_extend() { let selection = selection .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } } diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index bb0073e1c..72b0e9562 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -1996,7 +1996,9 @@ fn test_textobject_queries() { assert_eq!( matches[0].byte_range(), range, - "@{capture} expected {range:?}" + "@{} expected {:?}", + capture, + range ) }; diff --git a/helix-core/src/test.rs b/helix-core/src/test.rs index 064ca8a38..45503107c 100644 --- a/helix-core/src/test.rs +++ b/helix-core/src/test.rs @@ -53,7 +53,7 @@ pub fn print(s: &str) -> (String, Selection) { }; if is_primary && primary_idx.is_some() { - panic!("primary `#[` already appeared {left:?} {s:?}"); + panic!("primary `#[` already appeared {:?} {:?}", left, s); } let head_at_beg = iter.next_if_eq(&'|').is_some(); @@ -85,15 +85,15 @@ pub fn print(s: &str) -> (String, Selection) { } if head_at_beg { - panic!("missing end `{close_pair}#` {left:?} {s:?}"); + panic!("missing end `{}#` {:?} {:?}", close_pair, left, s); } else { - panic!("missing end `|{close_pair}#` {left:?} {s:?}"); + panic!("missing end `|{}#` {:?} {:?}", close_pair, left, s); } } let primary = match primary_idx { Some(i) => i, - None => panic!("missing primary `#[|]#` {s:?}"), + None => panic!("missing primary `#[|]#` {:?}", s), }; let selection = Selection::new(ranges, primary); (left, selection) diff --git a/helix-core/src/textobject.rs b/helix-core/src/textobject.rs index 67bf40a65..e7bbfc43e 100644 --- a/helix-core/src/textobject.rs +++ b/helix-core/src/textobject.rs @@ -381,7 +381,7 @@ fn test_textobject_paragraph_inside_single() { let selection = selection .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 1)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -404,7 +404,7 @@ fn test_textobject_paragraph_inside_double() { let selection = selection .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 2)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } } @@ -435,7 +435,7 @@ fn test_textobject_paragraph_around_single() { let selection = selection .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Around, 1)); let actual = crate::test::plain(&s, selection); - assert_eq!(actual, expected, "\nbefore: `{before:?}`"); + assert_eq!(actual, expected, "\nbefore: `{:?}`", before); } }