Skip to content

Commit 99157ea

Browse files
committed
---
yaml --- r: 60655 b: refs/heads/auto c: a4df35f h: refs/heads/master i: 60653: a99c4e0 60651: a612ee8 60647: 73eef5b 60639: 7fcc9a4 v: v3
1 parent 40ff24c commit 99157ea

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 609a9e69e1c1def4d570cfb3c31640200ef738c9
17+
refs/heads/auto: a4df35f2bcb9a399b2d4a1aa3c1def7682f9cb62
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libsyntax/ast.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ use abi::AbiSet;
1717
use opt_vec::OptVec;
1818
use parse::token::get_ident_interner;
1919

20-
use core::cast;
2120
use core::hashmap::HashMap;
22-
use core::option::{Option};
21+
use core::option::Option;
2322
use core::to_bytes::IterBytes;
2423
use core::to_bytes;
2524
use core::to_str::ToStr;

branches/auto/src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@
1515

1616
use core::prelude::*;
1717

18-
use abi::AbiSet;
1918
use ast::ident;
2019
use ast;
2120
use codemap::span;
22-
// use ext::quote::rt::*;
2321

2422
// Transitional reexports so qquote can find the paths it is looking for
2523
mod syntax {

branches/auto/src/libsyntax/parse/parser.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,7 @@ pub impl Parser {
27522752
match *self.token {
27532753
token::SEMI => {
27542754
if !vec::is_empty(attributes_box) {
2755-
self.span_err(*self.last_span,~"expected item after attributes");
2755+
self.span_err(*self.last_span, "expected item after attributes");
27562756
attributes_box = ~[];
27572757
}
27582758
self.bump(); // empty
@@ -2823,7 +2823,7 @@ pub impl Parser {
28232823
}
28242824

28252825
if !vec::is_empty(attributes_box) {
2826-
self.span_err(*self.last_span,~"expected item after attributes");
2826+
self.span_err(*self.last_span, "expected item after attributes");
28272827
}
28282828

28292829
let hi = self.span.hi;
@@ -3742,7 +3742,7 @@ pub impl Parser {
37423742
} = self.parse_foreign_items(first_item_attrs, true);
37433743
if (! attrs_remaining.is_empty()) {
37443744
self.span_err(*self.last_span,
3745-
~"expected item after attributes");
3745+
"expected item after attributes");
37463746
}
37473747
assert!(*self.token == token::RBRACE);
37483748
ast::foreign_mod {

0 commit comments

Comments
 (0)