Skip to content

Commit 5cfd075

Browse files
author
Keegan McAllister
committed
---
yaml --- r: 186358 b: refs/heads/try c: 74eef05 h: refs/heads/master v: v3
1 parent 60b6ecc commit 5cfd075

File tree

17 files changed

+53
-55
lines changed

17 files changed

+53
-55
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: bfaa1a8434de3991d9ceae3eea88674a74c5eef2
5+
refs/heads/try: 74eef05e7d029cee7407ab7939c326e6ea71a9c9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/src/doc/reference.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,11 @@ cases mentioned in [Number literals](#number-literals) below.
256256

257257
| [Number literals](#number-literals)`*` | Example | Exponentiation | Suffixes |
258258
|----------------------------------------|---------|----------------|----------|
259-
| Decimal integer | `98_222` | `N/A` | Integer suffixes |
260-
| Hex integer | `0xff` | `N/A` | Integer suffixes |
261-
| Octal integer | `0o77` | `N/A` | Integer suffixes |
262-
| Binary integer | `0b1111_0000` | `N/A` | Integer suffixes |
263-
| Floating-point | `123.0E+77` | `Optional` | Floating-point suffixes |
259+
| Decimal integer | `98_222is` | `N/A` | Integer suffixes |
260+
| Hex integer | `0xffis` | `N/A` | Integer suffixes |
261+
| Octal integer | `0o77is` | `N/A` | Integer suffixes |
262+
| Binary integer | `0b1111_0000is` | `N/A` | Integer suffixes |
263+
| Floating-point | `123.0E+77f64` | `Optional` | Floating-point suffixes |
264264

265265
`*` All number literals allow `_` as a visual separator: `1_234.0E+18f64`
266266

‎branches/try/src/libsyntax/ext/deriving/clone.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn expand_deriving_clone<F>(cx: &mut ExtCtxt,
2929
let trait_def = TraitDef {
3030
span: span,
3131
attributes: Vec::new(),
32-
path: Path::new(vec!("std", "clone", "Clone")),
32+
path: path!(std::clone::Clone),
3333
additional_bounds: Vec::new(),
3434
generics: LifetimeBounds::empty(),
3535
methods: vec!(

‎branches/try/src/libsyntax/ext/deriving/cmp/eq.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub fn expand_deriving_eq<F>(cx: &mut ExtCtxt,
7070
generics: LifetimeBounds::empty(),
7171
explicit_self: borrowed_explicit_self(),
7272
args: vec!(borrowed_self()),
73-
ret_ty: Literal(Path::new(vec!("bool"))),
73+
ret_ty: Literal(path!(bool)),
7474
attributes: attrs,
7575
combine_substructure: combine_substructure(box |a, b, c| {
7676
$f(a, b, c)
@@ -82,7 +82,7 @@ pub fn expand_deriving_eq<F>(cx: &mut ExtCtxt,
8282
let trait_def = TraitDef {
8383
span: span,
8484
attributes: Vec::new(),
85-
path: Path::new(vec!("std", "cmp", "PartialEq")),
85+
path: path!(std::cmp::PartialEq),
8686
additional_bounds: Vec::new(),
8787
generics: LifetimeBounds::empty(),
8888
methods: vec!(

‎branches/try/src/libsyntax/ext/deriving/cmp/ord.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn expand_deriving_ord<F>(cx: &mut ExtCtxt,
3636
generics: LifetimeBounds::empty(),
3737
explicit_self: borrowed_explicit_self(),
3838
args: vec!(borrowed_self()),
39-
ret_ty: Literal(Path::new(vec!("bool"))),
39+
ret_ty: Literal(path!(bool)),
4040
attributes: attrs,
4141
combine_substructure: combine_substructure(box |cx, span, substr| {
4242
cs_op($op, $equal, cx, span, substr)
@@ -45,8 +45,8 @@ pub fn expand_deriving_ord<F>(cx: &mut ExtCtxt,
4545
} }
4646
}
4747

48-
let ordering_ty = Literal(Path::new(vec!["std", "cmp", "Ordering"]));
49-
let ret_ty = Literal(Path::new_(vec!["std", "option", "Option"],
48+
let ordering_ty = Literal(path!(std::cmp::Ordering));
49+
let ret_ty = Literal(Path::new_(pathvec!(std::option::Option),
5050
None,
5151
vec![box ordering_ty],
5252
true));
@@ -69,7 +69,7 @@ pub fn expand_deriving_ord<F>(cx: &mut ExtCtxt,
6969
let trait_def = TraitDef {
7070
span: span,
7171
attributes: vec![],
72-
path: Path::new(vec!["std", "cmp", "PartialOrd"]),
72+
path: path!(std::cmp::PartialOrd),
7373
additional_bounds: vec![],
7474
generics: LifetimeBounds::empty(),
7575
methods: vec![

‎branches/try/src/libsyntax/ext/deriving/cmp/totaleq.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pub fn expand_deriving_totaleq<F>(cx: &mut ExtCtxt,
4646
let trait_def = TraitDef {
4747
span: span,
4848
attributes: Vec::new(),
49-
path: Path::new(vec!("std", "cmp", "Eq")),
49+
path: path!(std::cmp::Eq),
5050
additional_bounds: Vec::new(),
5151
generics: LifetimeBounds::empty(),
5252
methods: vec!(

‎branches/try/src/libsyntax/ext/deriving/cmp/totalord.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn expand_deriving_totalord<F>(cx: &mut ExtCtxt,
3030
let trait_def = TraitDef {
3131
span: span,
3232
attributes: Vec::new(),
33-
path: Path::new(vec!("std", "cmp", "Ord")),
33+
path: path!(std::cmp::Ord),
3434
additional_bounds: Vec::new(),
3535
generics: LifetimeBounds::empty(),
3636
methods: vec!(
@@ -39,7 +39,7 @@ pub fn expand_deriving_totalord<F>(cx: &mut ExtCtxt,
3939
generics: LifetimeBounds::empty(),
4040
explicit_self: borrowed_explicit_self(),
4141
args: vec!(borrowed_self()),
42-
ret_ty: Literal(Path::new(vec!("std", "cmp", "Ordering"))),
42+
ret_ty: Literal(path!(std::cmp::Ordering)),
4343
attributes: attrs,
4444
combine_substructure: combine_substructure(box |a, b, c| {
4545
cs_cmp(a, b, c)

‎branches/try/src/libsyntax/ext/deriving/decodable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn expand_deriving_decodable_imp<F>(cx: &mut ExtCtxt,
6868
args: vec!(Ptr(box Literal(Path::new_local("__D")),
6969
Borrowed(None, MutMutable))),
7070
ret_ty: Literal(Path::new_(
71-
vec!("std", "result", "Result"),
71+
pathvec!(std::result::Result),
7272
None,
7373
vec!(box Self, box Literal(Path::new_(
7474
vec!["__D", "Error"], None, vec![], false

‎branches/try/src/libsyntax/ext/deriving/default.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn expand_deriving_default<F>(cx: &mut ExtCtxt,
2929
let trait_def = TraitDef {
3030
span: span,
3131
attributes: Vec::new(),
32-
path: Path::new(vec!("std", "default", "Default")),
32+
path: path!(std::default::Default),
3333
additional_bounds: Vec::new(),
3434
generics: LifetimeBounds::empty(),
3535
methods: vec!(

‎branches/try/src/libsyntax/ext/deriving/encodable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn expand_deriving_encodable_imp<F>(cx: &mut ExtCtxt,
144144
args: vec!(Ptr(box Literal(Path::new_local("__S")),
145145
Borrowed(None, MutMutable))),
146146
ret_ty: Literal(Path::new_(
147-
vec!("std", "result", "Result"),
147+
pathvec!(std::result::Result),
148148
None,
149149
vec!(box Tuple(Vec::new()), box Literal(Path::new_(
150150
vec!["__S", "Error"], None, vec![], false

‎branches/try/src/libsyntax/ext/deriving/hash.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ pub fn expand_deriving_hash<F>(cx: &mut ExtCtxt,
2525
F: FnOnce(P<Item>),
2626
{
2727

28-
let path = Path::new_(vec!("std", "hash", "Hash"), None,
28+
let path = Path::new_(pathvec!(std::hash::Hash), None,
2929
vec!(box Literal(Path::new_local("__S"))), true);
3030
let generics = LifetimeBounds {
3131
lifetimes: Vec::new(),
3232
bounds: vec!(("__S",
33-
vec!(Path::new(vec!("std", "hash", "Writer")),
34-
Path::new(vec!("std", "hash", "Hasher"))))),
33+
vec!(path!(std::hash::Writer),
34+
path!(std::hash::Hasher)))),
3535
};
3636
let args = Path::new_local("__S");
3737
let inline = cx.meta_word(span, InternedString::new("inline"));

‎branches/try/src/libsyntax/ext/deriving/mod.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@ use ext::base::ExtCtxt;
1818
use codemap::Span;
1919
use ptr::P;
2020

21+
macro_rules! pathvec {
22+
($($x:ident)::+) => (
23+
vec![ $( stringify!($x) ),+ ]
24+
)
25+
}
26+
27+
macro_rules! path {
28+
($($x:tt)*) => (
29+
::ext::deriving::generic::ty::Path::new( pathvec!( $($x)* ) )
30+
)
31+
}
32+
2133
pub mod bounds;
2234
pub mod clone;
2335
pub mod encodable;

‎branches/try/src/libsyntax/ext/deriving/primitive.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,16 @@ pub fn expand_deriving_from_primitive<F>(cx: &mut ExtCtxt,
3030
let trait_def = TraitDef {
3131
span: span,
3232
attributes: Vec::new(),
33-
path: Path::new(vec!("std", "num", "FromPrimitive")),
33+
path: path!(std::num::FromPrimitive),
3434
additional_bounds: Vec::new(),
3535
generics: LifetimeBounds::empty(),
3636
methods: vec!(
3737
MethodDef {
3838
name: "from_i64",
3939
generics: LifetimeBounds::empty(),
4040
explicit_self: None,
41-
args: vec!(
42-
Literal(Path::new(vec!("i64")))),
43-
ret_ty: Literal(Path::new_(vec!("std", "option", "Option"),
41+
args: vec!(Literal(path!(i64))),
42+
ret_ty: Literal(Path::new_(pathvec!(std::option::Option),
4443
None,
4544
vec!(box Self),
4645
true)),
@@ -54,9 +53,8 @@ pub fn expand_deriving_from_primitive<F>(cx: &mut ExtCtxt,
5453
name: "from_u64",
5554
generics: LifetimeBounds::empty(),
5655
explicit_self: None,
57-
args: vec!(
58-
Literal(Path::new(vec!("u64")))),
59-
ret_ty: Literal(Path::new_(vec!("std", "option", "Option"),
56+
args: vec!(Literal(path!(u64))),
57+
ret_ty: Literal(Path::new_(pathvec!(std::option::Option),
6058
None,
6159
vec!(box Self),
6260
true)),

‎branches/try/src/libsyntax/ext/deriving/rand.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn expand_deriving_rand<F>(cx: &mut ExtCtxt,
3131
let trait_def = TraitDef {
3232
span: span,
3333
attributes: Vec::new(),
34-
path: Path::new(vec!("std", "rand", "Rand")),
34+
path: path!(std::rand::Rand),
3535
additional_bounds: Vec::new(),
3636
generics: LifetimeBounds::empty(),
3737
methods: vec!(
@@ -40,7 +40,7 @@ pub fn expand_deriving_rand<F>(cx: &mut ExtCtxt,
4040
generics: LifetimeBounds {
4141
lifetimes: Vec::new(),
4242
bounds: vec!(("R",
43-
vec!( Path::new(vec!("std", "rand", "Rng")) )))
43+
vec!( path!(std::rand::Rng) ))),
4444
},
4545
explicit_self: None,
4646
args: vec!(

‎branches/try/src/libsyntax/ext/deriving/show.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ pub fn expand_deriving_show<F>(cx: &mut ExtCtxt,
2929
F: FnOnce(P<Item>),
3030
{
3131
// &mut ::std::fmt::Formatter
32-
let fmtr = Ptr(box Literal(Path::new(vec!("std", "fmt", "Formatter"))),
32+
let fmtr = Ptr(box Literal(path!(std::fmt::Formatter)),
3333
Borrowed(None, ast::MutMutable));
3434

3535
let trait_def = TraitDef {
3636
span: span,
3737
attributes: Vec::new(),
38-
path: Path::new(vec!["std", "fmt", "Debug"]),
38+
path: path!(std::fmt::Debug),
3939
additional_bounds: Vec::new(),
4040
generics: LifetimeBounds::empty(),
4141
methods: vec![
@@ -44,7 +44,7 @@ pub fn expand_deriving_show<F>(cx: &mut ExtCtxt,
4444
generics: LifetimeBounds::empty(),
4545
explicit_self: borrowed_explicit_self(),
4646
args: vec!(fmtr),
47-
ret_ty: Literal(Path::new(vec!("std", "fmt", "Result"))),
47+
ret_ty: Literal(path!(std::fmt::Result)),
4848
attributes: Vec::new(),
4949
combine_substructure: combine_substructure(box |a, b, c| {
5050
show_substructure(a, b, c)

‎branches/try/src/libsyntax/ext/expand.rs

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -230,18 +230,15 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
230230
ast::ExprForLoop(pat, head, body, opt_ident) => {
231231
// to:
232232
//
233-
// {
234-
// let result = match ::std::iter::IntoIterator::into_iter(<head>) {
235-
// mut iter => {
236-
// [opt_ident]: loop {
237-
// match ::std::iter::Iterator::next(&mut iter) {
238-
// ::std::option::Option::Some(<pat>) => <body>,
239-
// ::std::option::Option::None => break
240-
// }
233+
// match ::std::iter::IntoIterator::into_iter(<head>) {
234+
// mut iter => {
235+
// [opt_ident]: loop {
236+
// match ::std::iter::Iterator::next(&mut iter) {
237+
// ::std::option::Option::Some(<pat>) => <body>,
238+
// ::std::option::Option::None => break
241239
// }
242240
// }
243-
// };
244-
// result
241+
// }
245242
// }
246243

247244
// expand <head>
@@ -322,16 +319,7 @@ pub fn expand_expr(e: P<ast::Expr>, fld: &mut MacroExpander) -> P<ast::Expr> {
322319

323320
fld.cx.expr_call(span, fld.cx.expr_path(into_iter_path), vec![head])
324321
};
325-
326-
let match_expr = fld.cx.expr_match(span, into_iter_expr, vec![iter_arm]);
327-
328-
// `{ let result = ...; result }`
329-
let result_ident = token::gensym_ident("result");
330-
fld.cx.expr_block(
331-
fld.cx.block_all(
332-
span,
333-
vec![fld.cx.stmt_let(span, false, result_ident, match_expr)],
334-
Some(fld.cx.expr_ident(span, result_ident))))
322+
fld.cx.expr_match(span, into_iter_expr, vec![iter_arm])
335323
}
336324

337325
ast::ExprClosure(capture_clause, fn_decl, block) => {

‎branches/try/src/test/run-pass/loop-label-shadowing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
fn main() {
1414
let mut foo = Vec::new();
1515
'foo: for i in &[1, 2, 3] {
16-
foo.push(*i);
16+
foo.push(i);
1717
}
1818
}
1919

0 commit comments

Comments
 (0)