From: Manish Goregaokar <manishsmail@gmail.com>
Date: Tue, 19 Dec 2017 20:27:51 +0000 (-0800)
Subject: Remove usage of quasi-quoting in tests
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~4^2~12^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f76583c2ad8cf33556e77dfa2d066dbf0c50fe9;p=cargo.git

Remove usage of quasi-quoting in tests

Only clippy and cargo use the old quasi quoting stuff, and we should be
removing it.
---

diff --git a/tests/cross-compile.rs b/tests/cross-compile.rs
index 4c7837fc9..cdb55f307 100644
--- a/tests/cross-compile.rs
+++ b/tests/cross-compile.rs
@@ -164,7 +164,9 @@ fn plugin_deps() {
             use rustc_plugin::Registry;
             use syntax::tokenstream::TokenTree;
             use syntax::codemap::Span;
+            use syntax::ast::*;
             use syntax::ext::base::{ExtCtxt, MacEager, MacResult};
+            use syntax::ext::build::AstBuilder;
 
             #[plugin_registrar]
             pub fn foo(reg: &mut Registry) {
@@ -173,7 +175,7 @@ fn plugin_deps() {
 
             fn expand_bar(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
                           -> Box<MacResult + 'static> {
-                MacEager::expr(quote_expr!(cx, 1))
+                MacEager::expr(cx.expr_lit(sp, LitKind::Int(1, LitIntType::Unsuffixed)))
             }
         "#)
         .build();
@@ -247,7 +249,10 @@ fn plugin_to_the_max() {
             use rustc_plugin::Registry;
             use syntax::tokenstream::TokenTree;
             use syntax::codemap::Span;
+            use syntax::ast::*;
             use syntax::ext::base::{ExtCtxt, MacEager, MacResult};
+            use syntax::ext::build::AstBuilder;
+            use syntax::ptr::P;
 
             #[plugin_registrar]
             pub fn foo(reg: &mut Registry) {
@@ -256,7 +261,9 @@ fn plugin_to_the_max() {
 
             fn expand_bar(cx: &mut ExtCtxt, sp: Span, tts: &[TokenTree])
                           -> Box<MacResult + 'static> {
-                MacEager::expr(quote_expr!(cx, baz::baz()))
+                let bar = Ident::from_str("baz");
+                let path = cx.path(sp, vec![bar.clone(), bar]);
+                MacEager::expr(cx.expr_call(sp, cx.expr_path(path), vec![]))
             }
         "#)
         .build();