@@ -38,6 +38,7 @@ Err(LexError)
3838Err(LexError)
3939Err(LexError)
4040Err(LexError)
41+ <<<<<<< HEAD
4142Ok(TokenStream [Ident { ident: "r", span: #44 bytes(361..385) }, Literal { kind: Char, symbol: "r", suffix: None, span: #44 bytes(361..385) }])
4243Ok(TokenStream [Ident { ident: "c", span: #44 bytes(361..385) }, Literal { kind: Char, symbol: "r", suffix: None, span: #44 bytes(361..385) }])
4344Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "0b2", suffix: None, span: #44 bytes(361..385) }])
@@ -51,4 +52,19 @@ Ok(Literal { kind: ErrWithGuar, symbol: "0b", suffix: Some("f32"), span: #44 byt
5152Ok(Literal { kind: ErrWithGuar, symbol: "0b0.0", suffix: Some("f32"), span: #44 bytes(361..385) })
5253Ok(Literal { kind: ErrWithGuar, symbol: "'''", suffix: None, span: #44 bytes(361..385) })
5354Ok(Literal { kind: ErrWithGuar, symbol: "'\n'", suffix: None, span: #44 bytes(361..385) })
55+ =======
56+ Ok(TokenStream [Ident { ident: "r", span: #25 bytes(276..300) }, Literal { kind: Char, symbol: "r", suffix: None, span: #25 bytes(276..300) }])
57+ Ok(TokenStream [Ident { ident: "c", span: #25 bytes(276..300) }, Literal { kind: Char, symbol: "r", suffix: None, span: #25 bytes(276..300) }])
58+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "0b2", suffix: None, span: #25 bytes(276..300) }])
59+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "0b", suffix: Some("f32"), span: #25 bytes(276..300) }])
60+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "0b0.0", suffix: Some("f32"), span: #25 bytes(276..300) }])
61+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "'''", suffix: None, span: #25 bytes(276..300) }])
62+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "'\n'", suffix: None, span: #25 bytes(276..300) }])
63+ Ok(TokenStream [Literal { kind: ErrWithGuar, symbol: "0b2", suffix: None, span: #25 bytes(276..300) }])
64+ Ok(Literal { kind: ErrWithGuar, symbol: "0b2", suffix: None, span: #25 bytes(276..300) })
65+ Ok(Literal { kind: ErrWithGuar, symbol: "0b", suffix: Some("f32"), span: #25 bytes(276..300) })
66+ Ok(Literal { kind: ErrWithGuar, symbol: "0b0.0", suffix: Some("f32"), span: #25 bytes(276..300) })
67+ Ok(Literal { kind: ErrWithGuar, symbol: "'''", suffix: None, span: #25 bytes(276..300) })
68+ Ok(Literal { kind: ErrWithGuar, symbol: "'\n'", suffix: None, span: #25 bytes(276..300) })
69+ >>>>>>> 5d5cc4119bb (add larger test for `proc_macro` `FromStr` implementations)
5470Err(LexError)
0 commit comments