diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-12-13 13:05:22 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-12-13 13:05:22 -0800 |
| commit | 4c2e4c37ce01a98c768a986b0b87a6e93ef72699 (patch) | |
| tree | 2797f91282868d040c9066e20e5eb83821ba0b1a /src/libsyntax/parse | |
| parent | 3c8dca429a9f8048227449cb9a5c5bb974c9891e (diff) | |
| download | rust-4c2e4c37ce01a98c768a986b0b87a6e93ef72699.tar.gz rust-4c2e4c37ce01a98c768a986b0b87a6e93ef72699.zip | |
librustc: Make `use` statements crate-relative by default. r=brson
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/attr.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/parse/common.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 11 | ||||
| -rw-r--r-- | src/libsyntax/parse/obsolete.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 16 | ||||
| -rw-r--r-- | src/libsyntax/parse/prec.rs | 4 |
7 files changed, 22 insertions, 22 deletions
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index 7248a0e2244..a4bef47fdf2 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -10,7 +10,7 @@ use either::{Either, Left, Right}; use ast_util::spanned; -use common::*; //resolve bug? +use parse::common::*; //resolve bug? export parser_attr; diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index e5a52628627..22b40736748 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -8,11 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use io::println;//XXXXXXXXxxx use io::ReaderUtil; use util::interner; -use lexer::{string_reader, bump, is_eof, nextch, - is_whitespace, get_str_from, reader}; +use parse::lexer::{string_reader, bump, is_eof, nextch, + is_whitespace, get_str_from, reader}; use codemap::{FileMap, CharPos}; export cmnt; diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs index a48e33c9405..246a8fa9c7c 100644 --- a/src/libsyntax/parse/common.rs +++ b/src/libsyntax/parse/common.rs @@ -10,8 +10,8 @@ use std::map::{HashMap}; use ast_util::spanned; -use parser::Parser; -use lexer::reader; +use parse::parser::Parser; +use parse::lexer::reader; type seq_sep = { sep: Option<token::Token>, diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 5a7b62f1ff6..803135f7599 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -20,6 +20,7 @@ export comments; export prec; export classify; export attr; +export obsolete; export parse_sess; export new_parse_sess, new_parse_sess_special_handler; @@ -35,14 +36,14 @@ export parse_stmt_from_source_str; export parse_tts_from_source_str; export parse_from_source_str; -use parser::Parser; -use attr::parser_attr; use ast::node_id; -use util::interner; +use codemap::{span, CodeMap, FileMap, CharPos, BytePos}; use diagnostic::{span_handler, mk_span_handler, mk_handler, emitter}; -use lexer::{reader, string_reader}; +use parse::attr::parser_attr; +use parse::lexer::{reader, string_reader}; +use parse::parser::Parser; use parse::token::{ident_interner, mk_ident_interner}; -use codemap::{span, CodeMap, FileMap, CharPos, BytePos}; +use util::interner; #[legacy_exports] diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index aa52575ef45..3db635f3b43 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -20,7 +20,7 @@ removed. use codemap::span; use ast::{expr, expr_lit, lit_nil}; use ast_util::{respan}; -use token::Token; +use parse::token::Token; /// The specific types of unsupported syntax pub enum ObsoleteSyntax { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 0f1c3467625..47f65ed2f8d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -13,19 +13,19 @@ use print::pprust::expr_to_str; use result::Result; use either::{Either, Left, Right}; use std::map::HashMap; -use token::{can_begin_expr, is_ident, is_ident_or_path, is_plain_ident, - INTERPOLATED, special_idents}; +use parse::token::{can_begin_expr, is_ident, is_ident_or_path, is_plain_ident, + INTERPOLATED, special_idents}; use codemap::{span,FssNone, BytePos}; use util::interner::Interner; use ast_util::{spanned, respan, mk_sp, ident_to_path, operator_prec}; -use lexer::reader; -use prec::{as_prec, token_to_binop}; -use attr::parser_attr; -use common::{seq_sep_trailing_disallowed, seq_sep_trailing_allowed, - seq_sep_none, token_to_str}; +use parse::lexer::reader; +use parse::prec::{as_prec, token_to_binop}; +use parse::attr::parser_attr; +use parse::common::{seq_sep_trailing_disallowed, seq_sep_trailing_allowed, + seq_sep_none, token_to_str}; use dvec::DVec; use vec::{push}; -use obsolete::{ +use parse::obsolete::{ ObsoleteSyntax, ObsoleteLowerCaseKindBounds, ObsoleteLet, ObsoleteFieldTerminator, ObsoleteStructCtor, diff --git a/src/libsyntax/parse/prec.rs b/src/libsyntax/parse/prec.rs index 8dada97e35d..4663b875bb5 100644 --- a/src/libsyntax/parse/prec.rs +++ b/src/libsyntax/parse/prec.rs @@ -12,8 +12,8 @@ export as_prec; export unop_prec; export token_to_binop; -use token::*; -use token::Token; +use parse::token::*; +use parse::token::Token; use ast::*; /// Unary operators have higher precedence than binary |
