diff options
| author | bors <bors@rust-lang.org> | 2015-03-28 12:42:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-28 12:42:45 +0000 |
| commit | 3e7385aae9d58c8e12137d7c07aad48551048c13 (patch) | |
| tree | 8da050722f9345ea690c8d0a05897013b6bef00d /src/libsyntax/parse | |
| parent | f8b6e28e758231f611e8e7923aa607cebd150717 (diff) | |
| parent | 95f4061c499fc2c908b4d38766813d8f649ec139 (diff) | |
| download | rust-3e7385aae9d58c8e12137d7c07aad48551048c13.tar.gz rust-3e7385aae9d58c8e12137d7c07aad48551048c13.zip | |
Auto merge of #23806 - Manishearth:rollup, r=Manishearth
- Successful merges: #23332, #23751, #23788, #23803, #23804 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/lexer/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index e11e9f62a5b..532b632fac8 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -14,7 +14,7 @@ use codemap; use diagnostic::SpanHandler; use ext::tt::transcribe::tt_next_token; use parse::token; -use parse::token::{str_to_ident}; +use parse::token::str_to_ident; use std::borrow::{IntoCow, Cow}; use std::char; diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b287093bf19..6f1f73aa2a9 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -11,7 +11,7 @@ pub use self::PathParsingMode::*; use abi; -use ast::{BareFnTy}; +use ast::BareFnTy; use ast::{RegionTyParamBound, TraitTyParamBound, TraitBoundModifier}; use ast::{Public, Unsafety}; use ast::{Mod, BiAdd, Arg, Arm, Attribute, BindByRef, BindByValue}; |
