Move ident-specific string cleanup out of segments

Author: dtolnay

src/lib.rs

@@ -332,21 +332,35 @@ fn parse_bracket_as_segments(input: TokenStream, scope: Span) -> Result<Vec<Segm
         None => return Err(Error::new(scope, "expected `[< ... >]`")),
     }
 
-    let segments = segment::parse(&mut tokens)?;
+    let mut segments = segment::parse(&mut tokens)?;
 
     match &tokens.next() {
         Some(TokenTree::Punct(punct)) if punct.as_char() == '>' => {}
         Some(wrong) => return Err(Error::new(wrong.span(), "expected `>`")),
         None => return Err(Error::new(scope, "expected `[< ... >]`")),
     }
 
-    match tokens.next() {
-        Some(unexpected) => Err(Error::new(
+    if let Some(unexpected) = tokens.next() {
+        return Err(Error::new(
             unexpected.span(),
             "unexpected input, expected `[< ... >]`",
-        )),
-        None => Ok(segments),
+        ));
     }
+
+    for segment in &mut segments {
+        if let Segment::String(string) = segment {
+            if string.value.contains(&['#', '\\', '.', '+'][..]) {
+                return Err(Error::new(string.span, "unsupported literal"));
+            }
+            string.value = string
+                .value
+                .replace('"', "")
+                .replace('\'', "")
+                .replace('-', "_");
+        }
+    }
+
+    Ok(segments)
 }
 
 fn pasted_to_tokens(mut pasted: String, span: Span) -> Result<TokenStream> {

src/segment.rs

@@ -96,16 +96,8 @@ pub(crate) fn parse(tokens: &mut Peekable<token_stream::IntoIter>) -> Result<Vec
                 }
             }
             TokenTree::Literal(lit) => {
-                let mut lit_string = lit.to_string();
-                if lit_string.contains(&['#', '\\', '.', '+'][..]) {
-                    return Err(Error::new(lit.span(), "unsupported literal"));
-                }
-                lit_string = lit_string
-                    .replace('"', "")
-                    .replace('\'', "")
-                    .replace('-', "_");
                 segments.push(Segment::String(LitStr {
-                    value: lit_string,
+                    value: lit.to_string(),
                     span: lit.span(),
                 }));
             }