Rollup merge of #130313 - c410-f3r:unlock-rfc-2011, r=thomcc · qinheping/verify-rust-std@89c9ef6 (original) (raw)

Original file line number Diff line number Diff line change
@@ -229,8 +229,8 @@ pub macro assert_matches {
229 229 pub macro cfg_match {
230 230 // with a final wildcard
231 231 (
232 - (cfg((cfg((cfg(initial_meta:meta) => { (((initial_tokens:item)* })+
233 - _ => { (((extra_tokens:item)* }
232 + (cfg((cfg((cfg(initial_meta:meta) => { (((initial_tokens:tt)* })+
233 + _ => { (((extra_tokens:tt)* }
234 234 ) => {
235 235 cfg_match! {
236 236 @__items ();
@@ -241,7 +241,7 @@ pub macro cfg_match {
241 241
242 242 // without a final wildcard
243 243 (
244 - (cfg((cfg((cfg(extra_meta:meta) => { (((extra_tokens:item)* })*
244 + (cfg((cfg((cfg(extra_meta:meta) => { (((extra_tokens:tt)* })*
245 245 ) => {
246 246 cfg_match! {
247 247 @__items ();
@@ -256,7 +256,7 @@ pub macro cfg_match {
256 256 (@__items ($($_:meta,)*);) => {},
257 257 (
258 258 @__items ($($no:meta,)*);
259 -(($($yes:meta)?) ($($tokens:item)*)),
259 +(($($yes:meta)?) ($($tokens:tt)*)),
260 260 (((rest:tt,)*
261 261 ) => {
262 262 // Emit all items within one block, applying an appropriate #[cfg]. The
@@ -279,7 +279,7 @@ pub macro cfg_match {
279 279
280 280 // Internal macro to make __apply work out right for different match types,
281 281 // because of how macros match/expand stuff.
282 -(@__identity (((tokens:item)*) => {
282 +(@__identity (((tokens:tt)*) => {
283 283 (((tokens)*
284 284 }
285 285 }