---

yaml
---
r: 12923
b: refs/heads/master
c: 9aa18c2
h: refs/heads/master
i:
  12921: 1229275
  12919: 5919631
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 47bb1185f2ae17e6a8b24da533c4d2f548e1e808
+refs/heads/master: 9aa18c285245099fdb03eae6ce5a5e0a79a01c21
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ast_map.rs renamed to trunk/src/librustsyntax/ast_map.rs

@@ -1,13 +1,10 @@
 import std::map;
 import std::map::hashmap;
-import syntax::ast::*;
-import syntax::print::pprust;
-import syntax::ast_util;
-import syntax::ast_util::path_to_ident;
-import syntax::ast_util::inlined_item_methods;
-import syntax::{visit, codemap};
-import syntax::attr;
-import syntax::diagnostic::span_handler;
+import ast::*;
+import print::pprust;
+import ast_util::path_to_ident;
+import ast_util::inlined_item_methods;
+import diagnostic::span_handler;
 
 enum path_elt { path_mod(str), path_name(str) }
 type path = [path_elt];

trunk/src/librustsyntax/rustsyntax.rc

@@ -16,6 +16,7 @@ mod diagnostic;
 mod codemap;
 mod ast;
 mod ast_util;
+mod ast_map;
 mod visit;
 mod fold;
 mod util {

trunk/src/rustc/back/link.rs

@@ -14,7 +14,7 @@ import syntax::print::pprust;
 import lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data, True, False,
         FileType};
 import util::filesearch;
-import middle::ast_map::{path, path_mod, path_name};
+import syntax::ast_map::{path, path_mod, path_name};
 
 enum output_type {
     output_type_none,

trunk/src/rustc/driver/driver.rs

@@ -160,7 +160,7 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
 
     let ast_map =
         time(time_passes, "ast indexing",
-             bind middle::ast_map::map_crate(sess.diagnostic(), *crate));
+             bind syntax::ast_map::map_crate(sess.diagnostic(), *crate));
     time(time_passes, "external crate/lib resolution",
          bind creader::read_crates(sess, *crate));
     let {def_map, exp_map, impl_map} =

trunk/src/rustc/metadata.rs

@@ -3,8 +3,6 @@
 // no dependencies on rustc it can move into its own crate.
 
 mod middle {
-    import ast_map = middle_::ast_map;
-    export ast_map;
     import ty = middle_::ty;
     export ty;
 }

trunk/src/rustc/metadata/csearch.rs

@@ -3,7 +3,8 @@
 import std::{ebml};
 import syntax::ast;
 import syntax::ast_util;
-import middle::{ty, ast_map};
+import syntax::ast_map;
+import middle::ty;
 import option::{some, none};
 import driver::session;
 import driver::session::expect;

trunk/src/rustc/metadata/decoder.rs

@@ -6,7 +6,7 @@ import io::writer_util;
 import syntax::{ast, ast_util};
 import syntax::attr;
 import middle::ty;
-import middle::ast_map;
+import syntax::ast_map;
 import common::*;
 import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
         parse_ident};

trunk/src/rustc/metadata/encoder.rs

@@ -13,7 +13,7 @@ import syntax::ast_util::local_def;
 import common::*;
 import middle::ty;
 import middle::ty::node_id_to_type;
-import middle::ast_map;
+import syntax::ast_map;
 import syntax::attr;
 import std::serialization::serializer;
 import std::ebml::serializer;

trunk/src/rustc/middle/alias.rs

@@ -1,4 +1,4 @@
-import syntax::{ast, ast_util};
+import syntax::{ast, ast_util, ast_map};
 import ast_util::path_to_ident;
 import ast::{ident, fn_ident, node_id};
 import syntax::codemap::span;

trunk/src/rustc/middle/astencode.rs

@@ -3,6 +3,7 @@ import util::ppaux::ty_to_str;
 import syntax::ast;
 import syntax::fold;
 import syntax::visit;
+import syntax::ast_map;
 import syntax::ast_util;
 import syntax::ast_util::inlined_item_methods;
 import syntax::codemap::span;
@@ -17,7 +18,7 @@ import std::serialization::serializer_helpers;
 import std::serialization::deserializer_helpers;
 import std::prettyprint::serializer;
 import std::smallintmap::map;
-import middle::{ty, typeck, last_use, ast_map};
+import middle::{ty, typeck, last_use};
 import middle::typeck::{method_origin,
                         serialize_method_origin,
                         deserialize_method_origin,

trunk/src/rustc/middle/borrowck.rs

@@ -2,6 +2,7 @@ import syntax::ast;
 import syntax::ast::{m_mutbl, m_imm, m_const};
 import syntax::visit;
 import syntax::ast_util;
+import syntax::ast_map;
 import syntax::codemap::span;
 import util::ppaux::{ty_to_str, region_to_str};
 import driver::session::session;

trunk/src/rustc/middle/check_const.rs

@@ -1,5 +1,5 @@
 import syntax::ast::*;
-import syntax::{visit, ast_util};
+import syntax::{visit, ast_util, ast_map};
 import driver::session::session;
 import std::map::hashmap;
 

trunk/src/rustc/middle/resolve.rs

@@ -1,4 +1,4 @@
-import syntax::{ast, ast_util, codemap};
+import syntax::{ast, ast_util, codemap, ast_map};
 import syntax::ast::*;
 import ast::{ident, fn_ident, def, def_id, node_id};
 import syntax::ast_util::{local_def, def_id_of_def,

trunk/src/rustc/middle/trans/base.rs

@@ -21,7 +21,7 @@ import driver::session;
 import session::session;
 import syntax::attr;
 import back::{link, abi, upcall};
-import syntax::{ast, ast_util, codemap};
+import syntax::{ast, ast_util, codemap, ast_map};
 import ast_util::{inlined_item_methods, local_def, path_to_ident};
 import syntax::visit;
 import syntax::codemap::span;
@@ -46,7 +46,7 @@ import build::*;
 import shape::*;
 import type_of::*;
 import type_of::type_of; // Issue #1873
-import ast_map::{path, path_mod, path_name};
+import syntax::ast_map::{path, path_mod, path_name};
 
 import std::smallintmap;
 

trunk/src/rustc/middle/trans/closure.rs

@@ -15,7 +15,7 @@ import back::link::{
     mangle_internal_name_by_path,
     mangle_internal_name_by_path_and_seq};
 import util::ppaux::ty_to_str;
-import ast_map::{path, path_mod, path_name};
+import syntax::ast_map::{path, path_mod, path_name};
 import driver::session::session;
 import std::map::hashmap;
 

trunk/src/rustc/middle/trans/common.rs

@@ -6,7 +6,7 @@
 import libc::c_uint;
 import vec::unsafe::to_ptr;
 import std::map::{hashmap,set};
-import syntax::ast;
+import syntax::{ast, ast_map};
 import driver::session;
 import session::session;
 import middle::{resolve, ty};
@@ -19,7 +19,7 @@ import lib::llvm::{ModuleRef, ValueRef, TypeRef, BasicBlockRef, BuilderRef};
 import lib::llvm::{True, False, Bool};
 import metadata::{csearch};
 import metadata::common::link_meta;
-import ast_map::path;
+import syntax::ast_map::path;
 import util::ppaux::ty_to_str;
 
 type namegen = fn@(str) -> str;

trunk/src/rustc/middle/trans/debuginfo.rs

@@ -6,7 +6,7 @@ import trans::common::*;
 import trans::base;
 import trans::build::B;
 import middle::ty;
-import syntax::{ast, codemap, ast_util};
+import syntax::{ast, codemap, ast_util, ast_map};
 import codemap::span;
 import ast::ty;
 import pat_util::*;

trunk/src/rustc/middle/trans/impl.rs

@@ -4,14 +4,14 @@ import common::*;
 import type_of::*;
 import build::*;
 import driver::session::session;
-import syntax::ast;
+import syntax::{ast, ast_map};
+import ast_map::{path, path_mod, path_name, node_id_to_str};
 import syntax::ast_util::{local_def, split_class_items};
 import metadata::csearch;
 import back::{link, abi};
 import lib::llvm::llvm;
 import lib::llvm::{ValueRef, TypeRef};
 import lib::llvm::llvm::LLVMGetParam;
-import ast_map::{path, path_mod, path_name, node_id_to_str};
 import std::map::hashmap;
 
 fn trans_impl(ccx: @crate_ctxt, path: path, name: ast::ident,

trunk/src/rustc/middle/trans/native.rs

@@ -4,7 +4,7 @@
 import driver::session::{session, arch_x86_64};
 import syntax::codemap::span;
 import libc::c_uint;
-import syntax::attr;
+import syntax::{attr, ast_map};
 import lib::llvm::{ llvm, TypeRef, ValueRef,
                     ModuleRef, CallConv, Attribute,
                     StructRetAttribute, ByValAttribute

trunk/src/rustc/middle/trans/reachable.rs

@@ -6,7 +6,7 @@
 // reachable as well.
 
 import syntax::ast::*;
-import syntax::{visit, ast_util};
+import syntax::{visit, ast_util, ast_map};
 import syntax::ast_util::def_id_of_def;
 import syntax::attr;
 import std::map::hashmap;

trunk/src/rustc/middle/trans/type_use.rs

@@ -23,6 +23,7 @@ import std::list::{list, cons, nil};
 import driver::session::session;
 import metadata::csearch;
 import syntax::ast::*, syntax::ast_util, syntax::visit;
+import syntax::ast_map;
 import common::*;
 
 // FIXME distinguish between size/alignment and take/drop dependencies

trunk/src/rustc/middle/ty.rs

@@ -3,7 +3,7 @@ import result::result;
 import std::map::hashmap;
 import driver::session;
 import session::session;
-import syntax::ast;
+import syntax::{ast, ast_map};
 import syntax::ast::*;
 import syntax::ast_util;
 import syntax::ast_util::{is_local, local_def, split_class_items};

trunk/src/rustc/middle/typeck.rs

@@ -39,9 +39,9 @@ independently:
 */
 
 import result::{result, extensions};
-import syntax::{ast, ast_util};
+import syntax::{ast, ast_util, ast_map};
 import ast::spanned;
-import ast_map::node_id_to_str;
+import syntax::ast_map::node_id_to_str;
 import syntax::ast_util::{local_def, respan, split_class_items};
 import syntax::visit;
 import metadata::csearch;

trunk/src/rustc/middle/typeck/check/method.rs

@@ -1,5 +1,6 @@
 /* Code to handle method lookups (which can be quite complex) */
 
+import syntax::ast_map;
 import regionmanip::universally_quantify_regions;
 import middle::typeck::infer::{ty_and_region_var_methods};
 

trunk/src/rustc/rustc.rc

@@ -49,7 +49,6 @@ mod middle {
         mod reachable;
     }
     mod ty;
-    mod ast_map;
     mod resolve;
     mod typeck {
         mod check {

trunk/src/rustc/util/common.rs

@@ -121,10 +121,10 @@ fn local_rhs_span(l: @ast::local, def: span) -> span {
     alt l.node.init { some(i) { ret i.expr.span; } _ { ret def; } }
 }
 
-fn is_main_name(path: middle::ast_map::path) -> bool {
+fn is_main_name(path: syntax::ast_map::path) -> bool {
     // FIXME: path should be a constrained type, so we know
     // the call to last doesn't fail
-    vec::last(path) == middle::ast_map::path_name("main")
+    vec::last(path) == syntax::ast_map::path_name("main")
 }
 
 //

trunk/src/rustc/util/ppaux.rs

@@ -7,7 +7,7 @@ import syntax::print::pprust;
 import syntax::print::pprust::{path_to_str, constr_args_to_str, proto_to_str,
                                mode_to_str};
 import syntax::{ast, ast_util};
-import middle::ast_map;
+import syntax::ast_map;
 import driver::session::session;
 
 fn bound_region_to_str(cx: ctxt, br: bound_region) -> str {

trunk/src/rustdoc/astsrv.rs

@@ -15,7 +15,7 @@ import syntax::diagnostic;
 import syntax::diagnostic::handler;
 import syntax::ast;
 import syntax::codemap;
-import rustc::middle::ast_map;
+import syntax::ast_map;
 import rustc::back::link;
 import rustc::util::filesearch;
 import rustc::front;

trunk/src/rustdoc/attr_pass.rs

@@ -7,7 +7,7 @@
 )];
 
 import syntax::ast;
-import rustc::middle::ast_map;
+import syntax::ast_map;
 import std::map::hashmap;
 
 export mk_pass;

trunk/src/rustdoc/prune_hidden_pass.rs

@@ -33,7 +33,7 @@ fn fold_mod(
 }
 
 fn is_hidden(srv: astsrv::srv, doc: doc::itemdoc) -> bool {
-    import rustc::middle::ast_map;
+    import syntax::ast_map;
 
     let id = doc.id;
     astsrv::exec(srv) {|ctxt|

trunk/src/rustdoc/prune_unexported_pass.rs

@@ -2,7 +2,7 @@
 
 import syntax::ast;
 import syntax::ast_util;
-import rustc::middle::ast_map;
+import syntax::ast_map;
 import std::map::hashmap;
 
 export mk_pass;

trunk/src/rustdoc/reexport_pass.rs

@@ -6,7 +6,7 @@ import std::list;
 import syntax::ast;
 import syntax::ast_util;
 import rustc::util::common;
-import rustc::middle::ast_map;
+import syntax::ast_map;
 import syntax::visit;
 import syntax::codemap;
 import rustc::middle::resolve;

trunk/src/rustdoc/tystr_pass.rs

@@ -3,7 +3,7 @@
 
 import syntax::ast;
 import syntax::print::pprust;
-import rustc::middle::ast_map;
+import syntax::ast_map;
 import std::map::hashmap;
 
 export mk_pass;