rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

librustc: Always parse macro!()/macro![] as expressions if not

Browse Source 
followed by a semicolon.

This allows code like `vec![1i, 2, 3].len();` to work.

This breaks code that uses macros as statements without putting
semicolons after them, such as:

    fn main() {
        ...
        assert!(a == b)
        assert!(c == d)
        println(...);
    }

It also breaks code that uses macros as items without semicolons:

    local_data_key!(foo)

    fn main() {
        println("hello world")
    }

Add semicolons to fix this code. Those two examples can be fixed as
follows:

    fn main() {
        ...
        assert!(a == b);
        assert!(c == d);
        println(...);
    }

    local_data_key!(foo);

    fn main() {
        println("hello world")
    }

RFC #378.

Closes #18635.

[breaking-change]
This commit is contained in:
Patrick Walton
2014-11-14 09:18:10 -08:00
committed by Jorge Aparicio
parent c0b2885ee1
commit ddb2466f6a
222 changed files with 2330 additions and 2039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libstd/ascii.rs
View File

@@ -638,14 +638,14 @@ mod tests {
use char::from_u32;
use str::StrPrelude;
macro_rules! v2ascii (
macro_rules! v2ascii {
( [$($e:expr),*]) => (&[$(Ascii{chr:$e}),*]);
(&[$($e:expr),*]) => (&[$(Ascii{chr:$e}),*]);
)
}
macro_rules! vec2ascii (
macro_rules! vec2ascii {
($($e:expr),*) => ([$(Ascii{chr:$e}),*].to_vec());
)
}
#[test]
fn test_ascii() {
@@ -788,7 +788,7 @@ mod tests {
let upper = if 'a' as u32 <= i && i <= 'z' as u32 { i + 'A' as u32 - 'a' as u32 }
else { i };
assert_eq!((from_u32(i).unwrap()).to_string().to_ascii_upper(),
(from_u32(upper).unwrap()).to_string())
(from_u32(upper).unwrap()).to_string());
i += 1;
}
}
@@ -804,7 +804,7 @@ mod tests {
let lower = if 'A' as u32 <= i && i <= 'Z' as u32 { i + 'a' as u32 - 'A' as u32 }
else { i };
assert_eq!((from_u32(i).unwrap()).to_string().to_ascii_lower(),
(from_u32(lower).unwrap()).to_string())
(from_u32(lower).unwrap()).to_string());
i += 1;
}
}
@@ -820,7 +820,7 @@ mod tests {
let upper = if 'a' as u32 <= i && i <= 'z' as u32 { i + 'A' as u32 - 'a' as u32 }
else { i };
assert_eq!((from_u32(i).unwrap()).to_string().into_ascii_upper(),
(from_u32(upper).unwrap()).to_string())
(from_u32(upper).unwrap()).to_string());
i += 1;
}
}
@@ -837,7 +837,7 @@ mod tests {
let lower = if 'A' as u32 <= i && i <= 'Z' as u32 { i + 'a' as u32 - 'A' as u32 }
else { i };
assert_eq!((from_u32(i).unwrap()).to_string().into_ascii_lower(),
(from_u32(lower).unwrap()).to_string())
(from_u32(lower).unwrap()).to_string());
i += 1;
}
}