Merge pull request #523 from dtolnay/display

Reset formatting options to display each token

Author: dtolnay

src/fallback.rs

@@ -222,13 +222,13 @@ impl Display for TokenStream {
             }
             joint = false;
             match tt {
-                TokenTree::Group(tt) => Display::fmt(tt, f),
-                TokenTree::Ident(tt) => Display::fmt(tt, f),
+                TokenTree::Group(tt) => write!(f, "{}", tt),
+                TokenTree::Ident(tt) => write!(f, "{}", tt),
                 TokenTree::Punct(tt) => {
                     joint = tt.spacing() == Spacing::Joint;
-                    Display::fmt(tt, f)
+                    write!(f, "{}", tt)
                 }
-                TokenTree::Literal(tt) => Display::fmt(tt, f),
+                TokenTree::Literal(tt) => write!(f, "{}", tt),
             }?;
         }
 

tests/test.rs

@@ -718,6 +718,13 @@ fn test_debug_ident() {
     assert_eq!(expected, format!("{:?}", ident));
 }
 
+#[test]
+fn test_display_tokenstream() {
+    let tts = TokenStream::from_str("[a + 1]").unwrap();
+    assert_eq!(format!("{tts}"), "[a + 1]");
+    assert_eq!(format!("{tts:-^5}"), "[a + 1]");
+}
+
 #[test]
 fn test_debug_tokenstream() {
     let tts = TokenStream::from_str("[a + 1]").unwrap();