Cleanup some ugly variable names, now that we have let
-hygiene.
This commit is contained in:
parent
0aae5574ea
commit
cdd5893347
@ -139,7 +139,7 @@ macro_rules! maybe_whole_expr (
|
||||
INTERPOLATED(token::NtPath(ref pt)) => Some((**pt).clone()),
|
||||
_ => None,
|
||||
};
|
||||
let ret = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::NtExpr(e)) => {
|
||||
Some(e)
|
||||
}
|
||||
@ -149,7 +149,7 @@ macro_rules! maybe_whole_expr (
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match ret {
|
||||
match found {
|
||||
Some(e) => {
|
||||
$p.bump();
|
||||
return e;
|
||||
@ -164,13 +164,13 @@ macro_rules! maybe_whole_expr (
|
||||
macro_rules! maybe_whole (
|
||||
($p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return x.clone()
|
||||
}
|
||||
@ -180,13 +180,13 @@ macro_rules! maybe_whole (
|
||||
);
|
||||
(no_clone $p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return x
|
||||
}
|
||||
@ -196,13 +196,13 @@ macro_rules! maybe_whole (
|
||||
);
|
||||
(deref $p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return (*x).clone()
|
||||
}
|
||||
@ -212,13 +212,13 @@ macro_rules! maybe_whole (
|
||||
);
|
||||
(Some $p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return Some(x.clone()),
|
||||
}
|
||||
@ -228,13 +228,13 @@ macro_rules! maybe_whole (
|
||||
);
|
||||
(iovi $p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return IoviItem(x.clone())
|
||||
}
|
||||
@ -244,13 +244,13 @@ macro_rules! maybe_whole (
|
||||
);
|
||||
(pair_empty $p:expr, $constructor:ident) => (
|
||||
{
|
||||
let __found__ = match ($p).token {
|
||||
let found = match ($p).token {
|
||||
INTERPOLATED(token::$constructor(_)) => {
|
||||
Some(($p).bump_and_get())
|
||||
}
|
||||
_ => None
|
||||
};
|
||||
match __found__ {
|
||||
match found {
|
||||
Some(INTERPOLATED(token::$constructor(x))) => {
|
||||
return (Vec::new(), x)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user