about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-01-15 15:01:31 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-01-15 18:53:30 -0800
commit42198c18f46aa1841ff2870c4841eafae7ec7e8d (patch)
treea669459825ecb6e8a78d4615fa2ccc0c2dee7836 /src/libsyntax/parse
parent5f32992b318790b1aca4449c00fe9c8ef999a402 (diff)
downloadrust-42198c18f46aa1841ff2870c4841eafae7ec7e8d.tar.gz
rust-42198c18f46aa1841ff2870c4841eafae7ec7e8d.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 2813f94a845..30cc9836374 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -52,7 +52,7 @@ use ast::{SelfExplicit, SelfRegion, SelfStatic, SelfValue};
 use ast::{Delimited, SequenceRepetition, TokenTree, TraitItem, TraitRef};
 use ast::{TtDelimited, TtSequence, TtToken};
 use ast::{TupleVariantKind, Ty, Ty_, TypeBinding};
-use ast::{TypeField, TyFixedLengthVec, TyBareFn};
+use ast::{TyFixedLengthVec, TyBareFn};
 use ast::{TyTypeof, TyInfer, TypeMethod};
 use ast::{TyParam, TyParamBound, TyParen, TyPath, TyPolyTraitRef, TyPtr, TyQPath};
 use ast::{TyRptr, TyTup, TyU32, TyVec, UnUniq};