rust: macros: get paste! { [A $pos] } to work for integers

Signed-off-by: Fabien Parent <fabien.parent@linaro.org>

Author: Fabo

rust/macros/paste.rs

@@ -7,7 +7,8 @@ fn concat(tokens: &[TokenTree], group_span: Span) -> TokenTree {
     let mut segments = Vec::new();
     let mut span = None;
     loop {
-        match tokens.next() {
+        let t = tokens.next();
+        match t {
             None => break,
             Some(TokenTree::Literal(lit)) => {
                 // Allow us to concat string literals by stripping quotes
@@ -46,6 +47,19 @@ fn concat(tokens: &[TokenTree], group_span: Span) -> TokenTree {
                 };
                 segments.push((value, sp));
             }
+            Some(TokenTree::Group(group)) => {
+                let stream: Vec<_> = group.stream().into_iter().collect();
+                if let TokenTree::Literal(lit) = &stream[0] {
+                    let mut value = lit.to_string();
+                    if value.starts_with('"') && value.ends_with('"') {
+                        value.remove(0);
+                        value.pop();
+                    }
+                    segments.push((value, lit.span()));
+                } else {
+                    panic!("unexpected token in paste segments");
+                }
+            }
             _ => panic!("unexpected token in paste segments"),
         };
     }