mirror of
https://github.com/rust-lang/rust.git
synced 2025-02-23 20:34:06 +00:00
fix existing tests
This commit is contained in:
mark
Mark Mansi
parent
1b41c9a42e
commit
1d94cc2a22
@ -73,7 +73,7 @@ macro_rules! follow_block {
|
||||
($b:block $t:ty) => {};
|
||||
($b:block $s:stmt) => {};
|
||||
($b:block $p:path) => {};
|
||||
($b:block $b:block) => {};
|
||||
($b:block $c:block) => {};
|
||||
($b:block $i:ident) => {};
|
||||
($b:block $t:tt) => {};
|
||||
($b:block $i:item) => {};
|
||||
@ -99,9 +99,9 @@ macro_rules! follow_ident {
|
||||
($i:ident $s:stmt) => {};
|
||||
($i:ident $p:path) => {};
|
||||
($i:ident $b:block) => {};
|
||||
($i:ident $i:ident) => {};
|
||||
($i:ident $j:ident) => {};
|
||||
($i:ident $t:tt) => {};
|
||||
($i:ident $i:item) => {};
|
||||
($i:ident $j:item) => {};
|
||||
($i:ident $m:meta) => {};
|
||||
}
|
||||
// FOLLOW(tt) = any token
|
||||
@ -120,12 +120,12 @@ macro_rules! follow_tt {
|
||||
($t:tt ident) => {};
|
||||
($t:tt $p:pat) => {};
|
||||
($t:tt $e:expr) => {};
|
||||
($t:tt $t:ty) => {};
|
||||
($t:tt $v:ty) => {};
|
||||
($t:tt $s:stmt) => {};
|
||||
($t:tt $p:path) => {};
|
||||
($t:tt $b:block) => {};
|
||||
($t:tt $i:ident) => {};
|
||||
($t:tt $t:tt) => {};
|
||||
($t:tt $v:tt) => {};
|
||||
($t:tt $i:item) => {};
|
||||
($t:tt $m:meta) => {};
|
||||
}
|
||||
@ -149,9 +149,9 @@ macro_rules! follow_item {
|
||||
($i:item $s:stmt) => {};
|
||||
($i:item $p:path) => {};
|
||||
($i:item $b:block) => {};
|
||||
($i:item $i:ident) => {};
|
||||
($i:item $j:ident) => {};
|
||||
($i:item $t:tt) => {};
|
||||
($i:item $i:item) => {};
|
||||
($i:item $j:item) => {};
|
||||
($i:item $m:meta) => {};
|
||||
}
|
||||
// FOLLOW(meta) = any token
|
||||
@ -177,7 +177,7 @@ macro_rules! follow_meta {
|
||||
($m:meta $i:ident) => {};
|
||||
($m:meta $t:tt) => {};
|
||||
($m:meta $i:item) => {};
|
||||
($m:meta $m:meta) => {};
|
||||
($m:meta $n:meta) => {};
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
||||
@ -12,11 +12,11 @@ macro_rules! follow_pat {
|
||||
($p:pat >) => {}; //~ERROR `$p:pat` is followed by `>`
|
||||
($p:pat +) => {}; //~ERROR `$p:pat` is followed by `+`
|
||||
($p:pat ident) => {}; //~ERROR `$p:pat` is followed by `ident`
|
||||
($p:pat $p:pat) => {}; //~ERROR `$p:pat` is followed by `$p:pat`
|
||||
($p:pat $q:pat) => {}; //~ERROR `$p:pat` is followed by `$q:pat`
|
||||
($p:pat $e:expr) => {}; //~ERROR `$p:pat` is followed by `$e:expr`
|
||||
($p:pat $t:ty) => {}; //~ERROR `$p:pat` is followed by `$t:ty`
|
||||
($p:pat $s:stmt) => {}; //~ERROR `$p:pat` is followed by `$s:stmt`
|
||||
($p:pat $p:path) => {}; //~ERROR `$p:pat` is followed by `$p:path`
|
||||
($p:pat $q:path) => {}; //~ERROR `$p:pat` is followed by `$q:path`
|
||||
($p:pat $b:block) => {}; //~ERROR `$p:pat` is followed by `$b:block`
|
||||
($p:pat $i:ident) => {}; //~ERROR `$p:pat` is followed by `$i:ident`
|
||||
($p:pat $t:tt) => {}; //~ERROR `$p:pat` is followed by `$t:tt`
|
||||
@ -37,7 +37,7 @@ macro_rules! follow_expr {
|
||||
($e:expr if) => {}; //~ERROR `$e:expr` is followed by `if`
|
||||
($e:expr in) => {}; //~ERROR `$e:expr` is followed by `in`
|
||||
($e:expr $p:pat) => {}; //~ERROR `$e:expr` is followed by `$p:pat`
|
||||
($e:expr $e:expr) => {}; //~ERROR `$e:expr` is followed by `$e:expr`
|
||||
($e:expr $f:expr) => {}; //~ERROR `$e:expr` is followed by `$f:expr`
|
||||
($e:expr $t:ty) => {}; //~ERROR `$e:expr` is followed by `$t:ty`
|
||||
($e:expr $s:stmt) => {}; //~ERROR `$e:expr` is followed by `$s:stmt`
|
||||
($e:expr $p:path) => {}; //~ERROR `$e:expr` is followed by `$p:path`
|
||||
@ -57,12 +57,12 @@ macro_rules! follow_ty {
|
||||
($t:ty if) => {}; //~ERROR `$t:ty` is followed by `if`
|
||||
($t:ty $p:pat) => {}; //~ERROR `$t:ty` is followed by `$p:pat`
|
||||
($t:ty $e:expr) => {}; //~ERROR `$t:ty` is followed by `$e:expr`
|
||||
($t:ty $t:ty) => {}; //~ERROR `$t:ty` is followed by `$t:ty`
|
||||
($t:ty $r:ty) => {}; //~ERROR `$t:ty` is followed by `$r:ty`
|
||||
($t:ty $s:stmt) => {}; //~ERROR `$t:ty` is followed by `$s:stmt`
|
||||
($t:ty $p:path) => {}; //~ERROR `$t:ty` is followed by `$p:path`
|
||||
($t:ty $b:block) => {}; // ok (RFC 1494)
|
||||
($t:ty $i:ident) => {}; //~ERROR `$t:ty` is followed by `$i:ident`
|
||||
($t:ty $t:tt) => {}; //~ERROR `$t:ty` is followed by `$t:tt`
|
||||
($t:ty $r:tt) => {}; //~ERROR `$t:ty` is followed by `$r:tt`
|
||||
($t:ty $i:item) => {}; //~ERROR `$t:ty` is followed by `$i:item`
|
||||
($t:ty $m:meta) => {}; //~ERROR `$t:ty` is followed by `$m:meta`
|
||||
}
|
||||
@ -82,7 +82,7 @@ macro_rules! follow_stmt {
|
||||
($s:stmt $p:pat) => {}; //~ERROR `$s:stmt` is followed by `$p:pat`
|
||||
($s:stmt $e:expr) => {}; //~ERROR `$s:stmt` is followed by `$e:expr`
|
||||
($s:stmt $t:ty) => {}; //~ERROR `$s:stmt` is followed by `$t:ty`
|
||||
($s:stmt $s:stmt) => {}; //~ERROR `$s:stmt` is followed by `$s:stmt`
|
||||
($s:stmt $t:stmt) => {}; //~ERROR `$s:stmt` is followed by `$t:stmt`
|
||||
($s:stmt $p:path) => {}; //~ERROR `$s:stmt` is followed by `$p:path`
|
||||
($s:stmt $b:block) => {}; //~ERROR `$s:stmt` is followed by `$b:block`
|
||||
($s:stmt $i:ident) => {}; //~ERROR `$s:stmt` is followed by `$i:ident`
|
||||
@ -97,11 +97,11 @@ macro_rules! follow_path {
|
||||
($p:path +) => {}; //~ERROR `$p:path` is followed by `+`
|
||||
($p:path ident) => {}; //~ERROR `$p:path` is followed by `ident`
|
||||
($p:path if) => {}; //~ERROR `$p:path` is followed by `if`
|
||||
($p:path $p:pat) => {}; //~ERROR `$p:path` is followed by `$p:pat`
|
||||
($p:path $q:pat) => {}; //~ERROR `$p:path` is followed by `$q:pat`
|
||||
($p:path $e:expr) => {}; //~ERROR `$p:path` is followed by `$e:expr`
|
||||
($p:path $t:ty) => {}; //~ERROR `$p:path` is followed by `$t:ty`
|
||||
($p:path $s:stmt) => {}; //~ERROR `$p:path` is followed by `$s:stmt`
|
||||
($p:path $p:path) => {}; //~ERROR `$p:path` is followed by `$p:path`
|
||||
($p:path $q:path) => {}; //~ERROR `$p:path` is followed by `$q:path`
|
||||
($p:path $b:block) => {}; // ok (RFC 1494)
|
||||
($p:path $i:ident) => {}; //~ERROR `$p:path` is followed by `$i:ident`
|
||||
($p:path $t:tt) => {}; //~ERROR `$p:path` is followed by `$t:tt`
|
||||
|
||||
@ -54,10 +54,10 @@ LL | ($p:pat ident) => {}; //~ERROR `$p:pat` is followed by `ident`
|
||||
|
|
||||
= note: allowed there are: `=>`, `,`, `=`, `|`, `if` or `in`
|
||||
|
||||
error: `$p:pat` is followed by `$p:pat`, which is not allowed for `pat` fragments
|
||||
error: `$p:pat` is followed by `$q:pat`, which is not allowed for `pat` fragments
|
||||
--> $DIR/macro-follow.rs:15:13
|
||||
|
|
||||
LL | ($p:pat $p:pat) => {}; //~ERROR `$p:pat` is followed by `$p:pat`
|
||||
LL | ($p:pat $q:pat) => {}; //~ERROR `$p:pat` is followed by `$q:pat`
|
||||
| ^^^^^^ not allowed after `pat` fragments
|
||||
|
|
||||
= note: allowed there are: `=>`, `,`, `=`, `|`, `if` or `in`
|
||||
@ -86,10 +86,10 @@ LL | ($p:pat $s:stmt) => {}; //~ERROR `$p:pat` is followed by `$s:stmt`
|
||||
|
|
||||
= note: allowed there are: `=>`, `,`, `=`, `|`, `if` or `in`
|
||||
|
||||
error: `$p:pat` is followed by `$p:path`, which is not allowed for `pat` fragments
|
||||
error: `$p:pat` is followed by `$q:path`, which is not allowed for `pat` fragments
|
||||
--> $DIR/macro-follow.rs:19:13
|
||||
|
|
||||
LL | ($p:pat $p:path) => {}; //~ERROR `$p:pat` is followed by `$p:path`
|
||||
LL | ($p:pat $q:path) => {}; //~ERROR `$p:pat` is followed by `$q:path`
|
||||
| ^^^^^^^ not allowed after `pat` fragments
|
||||
|
|
||||
= note: allowed there are: `=>`, `,`, `=`, `|`, `if` or `in`
|
||||
@ -230,10 +230,10 @@ LL | ($e:expr $p:pat) => {}; //~ERROR `$e:expr` is followed by `$p:pat`
|
||||
|
|
||||
= note: allowed there are: `=>`, `,` or `;`
|
||||
|
||||
error: `$e:expr` is followed by `$e:expr`, which is not allowed for `expr` fragments
|
||||
error: `$e:expr` is followed by `$f:expr`, which is not allowed for `expr` fragments
|
||||
--> $DIR/macro-follow.rs:40:14
|
||||
|
|
||||
LL | ($e:expr $e:expr) => {}; //~ERROR `$e:expr` is followed by `$e:expr`
|
||||
LL | ($e:expr $f:expr) => {}; //~ERROR `$e:expr` is followed by `$f:expr`
|
||||
| ^^^^^^^ not allowed after `expr` fragments
|
||||
|
|
||||
= note: allowed there are: `=>`, `,` or `;`
|
||||
@ -350,10 +350,10 @@ LL | ($t:ty $e:expr) => {}; //~ERROR `$t:ty` is followed by `$e:expr`
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
|
||||
error: `$t:ty` is followed by `$t:ty`, which is not allowed for `ty` fragments
|
||||
error: `$t:ty` is followed by `$r:ty`, which is not allowed for `ty` fragments
|
||||
--> $DIR/macro-follow.rs:60:12
|
||||
|
|
||||
LL | ($t:ty $t:ty) => {}; //~ERROR `$t:ty` is followed by `$t:ty`
|
||||
LL | ($t:ty $r:ty) => {}; //~ERROR `$t:ty` is followed by `$r:ty`
|
||||
| ^^^^^ not allowed after `ty` fragments
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
@ -382,10 +382,10 @@ LL | ($t:ty $i:ident) => {}; //~ERROR `$t:ty` is followed by `$i:ident`
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
|
||||
error: `$t:ty` is followed by `$t:tt`, which is not allowed for `ty` fragments
|
||||
error: `$t:ty` is followed by `$r:tt`, which is not allowed for `ty` fragments
|
||||
--> $DIR/macro-follow.rs:65:12
|
||||
|
|
||||
LL | ($t:ty $t:tt) => {}; //~ERROR `$t:ty` is followed by `$t:tt`
|
||||
LL | ($t:ty $r:tt) => {}; //~ERROR `$t:ty` is followed by `$r:tt`
|
||||
| ^^^^^ not allowed after `ty` fragments
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
@ -518,10 +518,10 @@ LL | ($s:stmt $t:ty) => {}; //~ERROR `$s:stmt` is followed by `$t:ty`
|
||||
|
|
||||
= note: allowed there are: `=>`, `,` or `;`
|
||||
|
||||
error: `$s:stmt` is followed by `$s:stmt`, which is not allowed for `stmt` fragments
|
||||
error: `$s:stmt` is followed by `$t:stmt`, which is not allowed for `stmt` fragments
|
||||
--> $DIR/macro-follow.rs:85:14
|
||||
|
|
||||
LL | ($s:stmt $s:stmt) => {}; //~ERROR `$s:stmt` is followed by `$s:stmt`
|
||||
LL | ($s:stmt $t:stmt) => {}; //~ERROR `$s:stmt` is followed by `$t:stmt`
|
||||
| ^^^^^^^ not allowed after `stmt` fragments
|
||||
|
|
||||
= note: allowed there are: `=>`, `,` or `;`
|
||||
@ -606,10 +606,10 @@ LL | ($p:path if) => {}; //~ERROR `$p:path` is followed by `if`
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
|
||||
error: `$p:path` is followed by `$p:pat`, which is not allowed for `path` fragments
|
||||
error: `$p:path` is followed by `$q:pat`, which is not allowed for `path` fragments
|
||||
--> $DIR/macro-follow.rs:100:14
|
||||
|
|
||||
LL | ($p:path $p:pat) => {}; //~ERROR `$p:path` is followed by `$p:pat`
|
||||
LL | ($p:path $q:pat) => {}; //~ERROR `$p:path` is followed by `$q:pat`
|
||||
| ^^^^^^ not allowed after `path` fragments
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
@ -638,10 +638,10 @@ LL | ($p:path $s:stmt) => {}; //~ERROR `$p:path` is followed by `$s:stmt`
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
|
||||
error: `$p:path` is followed by `$p:path`, which is not allowed for `path` fragments
|
||||
error: `$p:path` is followed by `$q:path`, which is not allowed for `path` fragments
|
||||
--> $DIR/macro-follow.rs:104:14
|
||||
|
|
||||
LL | ($p:path $p:path) => {}; //~ERROR `$p:path` is followed by `$p:path`
|
||||
LL | ($p:path $q:path) => {}; //~ERROR `$p:path` is followed by `$q:path`
|
||||
| ^^^^^^^ not allowed after `path` fragments
|
||||
|
|
||||
= note: allowed there are: `{`, `[`, `=>`, `,`, `>`, `=`, `:`, `;`, `|`, `as` or `where`
|
||||
|
||||
Loading…
Reference in New Issue
Block a user