about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-20 05:34:17 +0000
committerbors <bors@rust-lang.org>2018-04-20 05:34:17 +0000
commit257d43d0d580dc5e92a4aa4bebbd2bf5f04bbcae (patch)
treeee6b6445d219acb464dccabf95db51fb66526f50 /src/test
parentf4a3df1f76509b9dd7380db7ce60bd67bc5d5e7e (diff)
parente9348738fca8c88dca6e343702eaa12ffc8df34c (diff)
downloadrust-257d43d0d580dc5e92a4aa4bebbd2bf5f04bbcae.tar.gz
rust-257d43d0d580dc5e92a4aa4bebbd2bf5f04bbcae.zip
Auto merge of #50069 - alexcrichton:fix-proc-macro, r=nrc
proc_macro: Stay on the "use the cache" path more

Discovered in #50061 we're falling off the "happy path" of using a stringified
token stream more often than we should. This was due to the fact that a
user-written token like `0xf` is equality-different from the stringified token
of `15` (despite being semantically equivalent).

This patch updates the call to `eq_unspanned` with an even more awful solution,
`probably_equal_for_proc_macro`, which ignores the value of each token and
basically only compares the structure of the token stream, assuming that the AST
doesn't change just one token at a time.

While this is a step towards fixing #50061 there is still one regression
from #49154 which needs to be fixed.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
index 00a27818327..edfedebf870 100644
--- a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs
@@ -21,6 +21,8 @@ use attribute_with_error::foo;
 fn test1() {
     let a: i32 = "foo";
     //~^ ERROR: mismatched types
+    let b: i32 = "f'oo";
+    //~^ ERROR: mismatched types
 }
 
 fn test2() {