Merge pull request #1590 from dtolnay/streof

Improve error location at eof in LitStr::parse
dtolnay · Feb 16, 2024 · 981359c · 981359c
2 parents 270c633 + 51298d4
commit 981359c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/lit.rs b/src/lit.rs
@@ -225,10 +225,11 @@ impl LitStr {
 
         // Parse string literal into a token stream with every span equal to the
         // original literal's span.
+        let span = self.span();
         let mut tokens = TokenStream::from_str(&self.value())?;
-        tokens = respan_token_stream(tokens, self.span());
+        tokens = respan_token_stream(tokens, span);
 
-        let result = parser.parse2(tokens)?;
+        let result = crate::parse::parse_scoped(parser, span, tokens)?;
 
         let suffix = self.suffix();
         if !suffix.is_empty() {

diff --git a/src/parse.rs b/src/parse.rs
@@ -1268,7 +1268,6 @@ pub trait Parser: Sized {
 
     // Not public API.
     #[doc(hidden)]
-    #[cfg(any(feature = "full", feature = "derive"))]
     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
         let _ = scope;
         self.parse2(tokens)
@@ -1300,7 +1299,6 @@ where
         }
     }
 
-    #[cfg(any(feature = "full", feature = "derive"))]
     fn __parse_scoped(self, scope: Span, tokens: TokenStream) -> Result<Self::Output> {
         let buf = TokenBuffer::new2(tokens);
         let cursor = buf.begin();
@@ -1316,7 +1314,6 @@ where
     }
 }
 
-#[cfg(any(feature = "full", feature = "derive"))]
 pub(crate) fn parse_scoped<F: Parser>(f: F, scope: Span, tokens: TokenStream) -> Result<F::Output> {
     f.__parse_scoped(scope, tokens)
 }