Skip to content

Commit f9d789f

Browse files
committed
cleanup, fix test case
1 parent 9d962d8 commit f9d789f

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/libcore/dvec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ impl<A> DVec<A> {
229229
230230
impl<A: Copy> DVec<A> {
231231
/**
232-
* Append all elements of a vector to the end of the list.
232+
* Append all elements of a vector to the end of the list
233233
*
234234
* Equivalent to `append_iter()` but potentially more efficient.
235235
*/

src/libsyntax/ext/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub enum MacResult {
5959
MRExpr(@ast::expr),
6060
MRItem(@ast::item),
6161
MRAny(fn@()-> @ast::expr, fn@()-> Option<@ast::item>, fn@()->@ast::stmt),
62-
MRDef(MacroDef),
62+
MRDef(MacroDef)
6363
}
6464

6565
pub enum SyntaxExtension {

src/libsyntax/parse/common.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@ pub impl Parser {
217217
let mut first = true;
218218
let mut v = ~[];
219219
while self.token != token::GT
220-
// wait... isn't this going to eat a whole '>>' ?
221220
&& self.token != token::BINOP(token::SHR) {
222221
match sep {
223222
Some(ref t) => {

src/libsyntax/parse/mod.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,17 @@ mod test {
244244
~[],
245245
new_parse_sess(None));
246246
check_equal(to_json_str(tts as Encodable::<std::json::Encoder>),
247-
//[["tt_tok",["IDENT","fn"]]]
248-
~"abc"
247+
~"[[\"tt_tok\",[,[\"IDENT\",[\"fn\",false]]]],\
248+
[\"tt_tok\",[,[\"IDENT\",[\"foo\",false]]]],\
249+
[\"tt_delim\",[[[\"tt_tok\",[,[\"LPAREN\",[]]]],\
250+
[\"tt_tok\",[,[\"IDENT\",[\"x\",false]]]],\
251+
[\"tt_tok\",[,[\"COLON\",[]]]],\
252+
[\"tt_tok\",[,[\"IDENT\",[\"int\",false]]]],\
253+
[\"tt_tok\",[,[\"RPAREN\",[]]]]]]],\
254+
[\"tt_delim\",[[[\"tt_tok\",[,[\"LBRACE\",[]]]],\
255+
[\"tt_tok\",[,[\"IDENT\",[\"x\",false]]]],\
256+
[\"tt_tok\",[,[\"SEMI\",[]]]],\
257+
[\"tt_tok\",[,[\"RBRACE\",[]]]]]]]]"
249258
);
250259
let ast1 = new_parser_from_tts(new_parse_sess(None),~[],tts)
251260
.parse_item(~[]);

0 commit comments

Comments
 (0)