Skip to content

Commit ce6fcbd

Browse files
borsbors
committed
---
yaml --- r: 208573 b: refs/heads/snap-stage3 c: 4ce08a5 h: refs/heads/master i: 208571: 52b3c2a v: v3
1 parent f05de06 commit ce6fcbd

File tree

12 files changed

+126
-54
lines changed

12 files changed

+126
-54
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 38a97becdf3e6a6157f6f7ec2d98ade8d8edc193
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 900f27dc7cb9af9aa0763fcc3d5f4556a4fc9736
4+
refs/heads/snap-stage3: 4ce08a5d70a4dfc4da7ed0bc0098cfd2176b8411
55
refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

‎branches/snap-stage3/README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# The Rust Programming Language
22

3-
This is a compiler for Rust, including standard libraries, tools and
4-
documentation. Rust is a systems programming language that is fast,
5-
memory safe and multithreaded, but does not employ a garbage collector
6-
or otherwise impose significant runtime overhead.
3+
Rust is a systems programming language that is fast, memory safe and
4+
multithreaded, but does not employ a garbage collector or otherwise
5+
impose significant runtime overhead.
6+
7+
This repo contains the code for `rustc`, the Rust compiler, as well
8+
as standard libraries, tools and documentation for Rust.
79

810
## Quick Start
911

‎branches/snap-stage3/src/doc/trpl/const-and-static.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ static N: i32 = 5;
3131

3232
Unlike [`let`][let] bindings, you must annotate the type of a `static`.
3333

34-
[let]: variable-bindings.html
35-
3634
Statics live for the entire lifetime of a program, and therefore any
37-
reference stored in a constant has a [`’static` lifetime][lifetimes]:
35+
reference stored in a constant has a [`'static` lifetime][lifetimes]:
3836

3937
```rust
4038
static NAME: &'static str = "Steve";

‎branches/snap-stage3/src/doc/trpl/nightly-rust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ $ sh rustup.sh --channel=nightly
2626
If you're on Windows, please download either the [32-bit installer][win32] or
2727
the [64-bit installer][win64] and run it.
2828

29-
[win32]: https://static.rust-lang.org/dist/rust-1.0.0-beta-i686-pc-windows-gnu.msi
30-
[win64]: https://static.rust-lang.org/dist/rust-1.0.0-beta-x86_64-pc-windows-gnu.msi
29+
[win32]: https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.msi
30+
[win64]: https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-gnu.msi
3131

3232
## Uninstalling
3333

‎branches/snap-stage3/src/libsyntax/ext/quote.rs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ pub mod rt {
2828
use ast;
2929
use codemap::Spanned;
3030
use ext::base::ExtCtxt;
31-
use parse::token;
32-
use parse;
31+
use parse::{self, token, classify};
3332
use ptr::P;
3433
use std::rc::Rc;
3534

@@ -94,6 +93,18 @@ pub mod rt {
9493
}
9594
}
9695

96+
impl ToTokens for ast::Generics {
97+
fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
98+
vec![ast::TtToken(DUMMY_SP, token::Interpolated(token::NtGenerics(self.clone())))]
99+
}
100+
}
101+
102+
impl ToTokens for ast::WhereClause {
103+
fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
104+
vec![ast::TtToken(DUMMY_SP, token::Interpolated(token::NtWhereClause(self.clone())))]
105+
}
106+
}
107+
97108
impl ToTokens for P<ast::Item> {
98109
fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
99110
vec![ast::TtToken(self.span, token::Interpolated(token::NtItem(self.clone())))]
@@ -114,7 +125,16 @@ pub mod rt {
114125

115126
impl ToTokens for P<ast::Stmt> {
116127
fn to_tokens(&self, _cx: &ExtCtxt) -> Vec<TokenTree> {
117-
vec![ast::TtToken(self.span, token::Interpolated(token::NtStmt(self.clone())))]
128+
let mut tts = vec![
129+
ast::TtToken(self.span, token::Interpolated(token::NtStmt(self.clone())))
130+
];
131+
132+
// Some statements require a trailing semicolon.
133+
if classify::stmt_ends_with_semi(&self.node) {
134+
tts.push(ast::TtToken(self.span, token::Semi));
135+
}
136+
137+
tts
118138
}
119139
}
120140

‎branches/snap-stage3/src/libsyntax/fold.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,9 @@ pub fn noop_fold_interpolated<T: Folder>(nt: token::Nonterminal, fld: &mut T)
689689
token::NtTraitItem(arm) =>
690690
token::NtTraitItem(fld.fold_trait_item(arm)
691691
.expect_one("expected fold to produce exactly one item")),
692+
token::NtGenerics(generics) => token::NtGenerics(fld.fold_generics(generics)),
693+
token::NtWhereClause(where_clause) =>
694+
token::NtWhereClause(fld.fold_where_clause(where_clause)),
692695
}
693696
}
694697

‎branches/snap-stage3/src/libsyntax/parse/lexer/mod.rs

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -403,45 +403,51 @@ impl<'a> StringReader<'a> {
403403
Some('/') => {
404404
self.bump();
405405
self.bump();
406+
406407
// line comments starting with "///" or "//!" are doc-comments
407-
if self.curr_is('/') || self.curr_is('!') {
408-
let start_bpos = self.pos - BytePos(3);
409-
while !self.is_eof() {
410-
match self.curr.unwrap() {
411-
'\n' => break,
412-
'\r' => {
413-
if self.nextch_is('\n') {
414-
// CRLF
415-
break
416-
} else {
417-
self.err_span_(self.last_pos, self.pos,
418-
"bare CR not allowed in doc-comment");
419-
}
408+
let doc_comment = self.curr_is('/') || self.curr_is('!');
409+
let start_bpos = if doc_comment {
410+
self.pos - BytePos(3)
411+
} else {
412+
self.last_pos - BytePos(2)
413+
};
414+
415+
while !self.is_eof() {
416+
match self.curr.unwrap() {
417+
'\n' => break,
418+
'\r' => {
419+
if self.nextch_is('\n') {
420+
// CRLF
421+
break
422+
} else if doc_comment {
423+
self.err_span_(self.last_pos, self.pos,
424+
"bare CR not allowed in doc-comment");
420425
}
421-
_ => ()
422426
}
423-
self.bump();
427+
_ => ()
424428
}
425-
return self.with_str_from(start_bpos, |string| {
426-
// but comments with only more "/"s are not
429+
self.bump();
430+
}
431+
432+
return if doc_comment {
433+
self.with_str_from(start_bpos, |string| {
434+
// comments with only more "/"s are not doc comments
427435
let tok = if is_doc_comment(string) {
428436
token::DocComment(token::intern(string))
429437
} else {
430438
token::Comment
431439
};
432440

433-
return Some(TokenAndSpan{
441+
Some(TokenAndSpan {
434442
tok: tok,
435443
sp: codemap::mk_sp(start_bpos, self.last_pos)
436-
});
437-
});
444+
})
445+
})
438446
} else {
439-
let start_bpos = self.last_pos - BytePos(2);
440-
while !self.curr_is('\n') && !self.is_eof() { self.bump(); }
441-
return Some(TokenAndSpan {
447+
Some(TokenAndSpan {
442448
tok: token::Comment,
443449
sp: codemap::mk_sp(start_bpos, self.last_pos)
444-
});
450+
})
445451
}
446452
}
447453
Some('*') => {
@@ -1563,4 +1569,13 @@ mod tests {
15631569
assert_eq!(lexer.next_token().tok, token::Literal(token::Char(token::intern("a")), None));
15641570
}
15651571

1572+
#[test] fn crlf_comments() {
1573+
let sh = mk_sh();
1574+
let mut lexer = setup(&sh, "// test\r\n/// test\r\n".to_string());
1575+
let comment = lexer.next_token();
1576+
assert_eq!(comment.tok, token::Comment);
1577+
assert_eq!(comment.sp, ::codemap::mk_sp(BytePos(0), BytePos(7)));
1578+
assert_eq!(lexer.next_token().tok, token::Whitespace);
1579+
assert_eq!(lexer.next_token().tok, token::DocComment(token::intern("/// test")));
1580+
}
15661581
}

‎branches/snap-stage3/src/libsyntax/parse/parser.rs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,7 +2026,8 @@ impl<'a> Parser<'a> {
20262026
return self.parse_block_expr(lo, DefaultBlock);
20272027
},
20282028
token::BinOp(token::Or) | token::OrOr => {
2029-
return self.parse_lambda_expr(CaptureByRef);
2029+
let lo = self.span.lo;
2030+
return self.parse_lambda_expr(lo, CaptureByRef);
20302031
},
20312032
token::Ident(id @ ast::Ident {
20322033
name: token::SELF_KEYWORD_NAME,
@@ -2081,7 +2082,8 @@ impl<'a> Parser<'a> {
20812082
return Ok(self.mk_expr(lo, hi, ExprPath(Some(qself), path)));
20822083
}
20832084
if try!(self.eat_keyword(keywords::Move) ){
2084-
return self.parse_lambda_expr(CaptureByValue);
2085+
let lo = self.last_span.lo;
2086+
return self.parse_lambda_expr(lo, CaptureByValue);
20852087
}
20862088
if try!(self.eat_keyword(keywords::If)) {
20872089
return self.parse_if_expr();
@@ -2840,10 +2842,9 @@ impl<'a> Parser<'a> {
28402842
}
28412843

28422844
// `|args| expr`
2843-
pub fn parse_lambda_expr(&mut self, capture_clause: CaptureClause)
2845+
pub fn parse_lambda_expr(&mut self, lo: BytePos, capture_clause: CaptureClause)
28442846
-> PResult<P<Expr>>
28452847
{
2846-
let lo = self.span.lo;
28472848
let decl = try!(self.parse_fn_block_decl());
28482849
let body = match decl.output {
28492850
DefaultReturn(_) => {
@@ -3808,6 +3809,8 @@ impl<'a> Parser<'a> {
38083809
/// | ( < lifetimes , typaramseq ( , )? > )
38093810
/// where typaramseq = ( typaram ) | ( typaram , typaramseq )
38103811
pub fn parse_generics(&mut self) -> PResult<ast::Generics> {
3812+
maybe_whole!(self, NtGenerics);
3813+
38113814
if try!(self.eat(&token::Lt) ){
38123815
let lifetime_defs = try!(self.parse_lifetime_defs());
38133816
let mut seen_default = false;
@@ -3928,6 +3931,8 @@ impl<'a> Parser<'a> {
39283931
/// where T : Trait<U, V> + 'b, 'a : 'b
39293932
/// ```
39303933
pub fn parse_where_clause(&mut self) -> PResult<ast::WhereClause> {
3934+
maybe_whole!(self, NtWhereClause);
3935+
39313936
let mut where_clause = WhereClause {
39323937
id: ast::DUMMY_NODE_ID,
39333938
predicates: Vec::new(),

‎branches/snap-stage3/src/libsyntax/parse/token.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ pub enum Nonterminal {
385385
NtArm(ast::Arm),
386386
NtImplItem(P<ast::ImplItem>),
387387
NtTraitItem(P<ast::TraitItem>),
388+
NtGenerics(ast::Generics),
389+
NtWhereClause(ast::WhereClause),
388390
}
389391

390392
impl fmt::Debug for Nonterminal {
@@ -403,6 +405,8 @@ impl fmt::Debug for Nonterminal {
403405
NtArm(..) => f.pad("NtArm(..)"),
404406
NtImplItem(..) => f.pad("NtImplItem(..)"),
405407
NtTraitItem(..) => f.pad("NtTraitItem(..)"),
408+
NtGenerics(..) => f.pad("NtGenerics(..)"),
409+
NtWhereClause(..) => f.pad("NtWhereClause(..)"),
406410
}
407411
}
408412
}

‎branches/snap-stage3/src/libsyntax/print/pprust.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,21 @@ pub fn token_to_string(tok: &Token) -> String {
287287
token::SpecialVarNt(var) => format!("${}", var.as_str()),
288288

289289
token::Interpolated(ref nt) => match *nt {
290-
token::NtExpr(ref e) => expr_to_string(&**e),
291-
token::NtMeta(ref e) => meta_item_to_string(&**e),
292-
token::NtTy(ref e) => ty_to_string(&**e),
293-
token::NtPath(ref e) => path_to_string(&**e),
294-
token::NtItem(..) => "an interpolated item".to_string(),
295-
token::NtBlock(..) => "an interpolated block".to_string(),
296-
token::NtStmt(..) => "an interpolated statement".to_string(),
297-
token::NtPat(..) => "an interpolated pattern".to_string(),
298-
token::NtIdent(..) => "an interpolated identifier".to_string(),
299-
token::NtTT(..) => "an interpolated tt".to_string(),
300-
token::NtArm(..) => "an interpolated arm".to_string(),
301-
token::NtImplItem(..) => "an interpolated impl item".to_string(),
302-
token::NtTraitItem(..) => "an interpolated trait item".to_string(),
290+
token::NtExpr(ref e) => expr_to_string(&**e),
291+
token::NtMeta(ref e) => meta_item_to_string(&**e),
292+
token::NtTy(ref e) => ty_to_string(&**e),
293+
token::NtPath(ref e) => path_to_string(&**e),
294+
token::NtItem(ref e) => item_to_string(&**e),
295+
token::NtBlock(ref e) => block_to_string(&**e),
296+
token::NtStmt(ref e) => stmt_to_string(&**e),
297+
token::NtPat(ref e) => pat_to_string(&**e),
298+
token::NtIdent(ref e, _) => ident_to_string(&**e),
299+
token::NtTT(ref e) => tt_to_string(&**e),
300+
token::NtArm(ref e) => arm_to_string(&*e),
301+
token::NtImplItem(ref e) => impl_item_to_string(&**e),
302+
token::NtTraitItem(ref e) => trait_item_to_string(&**e),
303+
token::NtGenerics(ref e) => generics_to_string(&*e),
304+
token::NtWhereClause(ref e) => where_clause_to_string(&*e),
303305
}
304306
}
305307
}

‎branches/snap-stage3/src/test/compile-fail/move-closure-span.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Make sure that the span of a closure marked `move` begins at the `move` keyword.
12+
13+
fn main() {
14+
let x: () =
15+
move //~ ERROR mismatched types
16+
|| ();
17+
}

‎branches/snap-stage3/src/test/run-pass-fulldeps/quote-tokens.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ fn syntax_extension(cx: &ExtCtxt) {
4343
let _n: syntax::ast::Attribute = quote_attr!(cx, #![cfg(foo, bar = "baz")]);
4444

4545
let _o: Option<P<syntax::ast::Item>> = quote_item!(cx, fn foo<T: ?Sized>() {});
46+
47+
let stmts = vec![
48+
quote_stmt!(cx, let x = 1;).unwrap(),
49+
quote_stmt!(cx, let y = 2;).unwrap(),
50+
];
51+
let expr: P<syntax::ast::Expr> = quote_expr!(cx, x + y);
4652
}
4753

4854
fn main() {

0 commit comments

Comments
 (0)