syntax: Move ast_map into it's own crate

This lets us remove the arena dependency from libsyntax, which
is unstable.

Author: erickt

mk/crates.mk

@@ -55,8 +55,9 @@ TARGET_CRATES := libc std flate arena term \
                  rustc_unicode rustc_bitflags
 RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
                 rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
-                rustc_data_structures
-HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
+                rustc_data_structures rustc_ast_map
+SYNTAX_CRATES := syntax
+HOST_CRATES := $(SYNTAX_CRATES) $(RUSTC_CRATES) rustdoc fmt_macros
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc rustbook
 
@@ -68,24 +69,26 @@ DEPS_std := core libc rand alloc collections rustc_unicode \
 	native:rust_builtin native:backtrace native:rustrt_native \
 	rustc_bitflags
 DEPS_graphviz := std
-DEPS_syntax := std term serialize log fmt_macros arena libc
+DEPS_syntax := std term serialize log fmt_macros libc
 DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
                      rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
-		     rustc_trans rustc_privacy rustc_lint
+                     rustc_trans rustc_privacy rustc_lint rustc_ast_map
 
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
-	                log syntax serialize rustc_llvm
-DEPS_rustc_typeck := rustc syntax
-DEPS_rustc_borrowck := rustc log graphviz syntax
-DEPS_rustc_resolve := rustc log syntax
-DEPS_rustc_privacy := rustc log syntax
-DEPS_rustc_lint := rustc log syntax
+                    log syntax rustc_ast_map serialize rustc_llvm
+DEPS_rustc_typeck := rustc syntax rustc_ast_map
+DEPS_rustc_borrowck := rustc log graphviz syntax rustc_ast_map
+DEPS_rustc_resolve := rustc log syntax rustc_ast_map
+DEPS_rustc_privacy := rustc log syntax rustc_ast_map
+DEPS_rustc_lint := rustc log syntax rustc_ast_map
 DEPS_rustc := syntax flate arena serialize getopts rbml \
-              log graphviz rustc_llvm rustc_back rustc_data_structures
+              log graphviz rustc_llvm rustc_back rustc_data_structures \
+              rustc_ast_map
 DEPS_rustc_llvm := native:rustllvm libc std
 DEPS_rustc_back := std syntax rustc_llvm flate log libc
 DEPS_rustc_data_structures := std log serialize
-DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
+DEPS_rustc_ast_map := std arena syntax
+DEPS_rustdoc := rustc rustc_driver native:hoedown syntax rustc_ast_map serialize getopts \
                 test rustc_lint
 DEPS_rustc_bitflags := core
 DEPS_flate := std native:miniz

src/librustc/lib.rs

@@ -52,9 +52,10 @@ extern crate fmt_macros;
 extern crate getopts;
 extern crate graphviz;
 extern crate libc;
-extern crate rustc_llvm;
+extern crate rustc_ast_map;
 extern crate rustc_back;
 extern crate rustc_data_structures;
+extern crate rustc_llvm;
 extern crate serialize;
 extern crate rbml;
 extern crate collections;

src/librustc/metadata/csearch.rs

@@ -19,9 +19,9 @@ use middle::ty;
 
 use rbml;
 use rbml::reader;
+use rustc_ast_map as ast_map;
 use std::rc::Rc;
 use syntax::ast;
-use syntax::ast_map;
 use syntax::attr;
 use syntax::attr::AttrMetaMethods;
 use syntax::diagnostic::expect;

src/librustc/metadata/decoder.rs

@@ -43,8 +43,8 @@ use std::str;
 
 use rbml::reader;
 use rbml;
+use rustc_ast_map as ast_map;
 use serialize::Decodable;
-use syntax::ast_map;
 use syntax::attr;
 use syntax::parse::token::{IdentInterner, special_idents};
 use syntax::parse::token;

src/librustc/metadata/encoder.rs

@@ -32,9 +32,11 @@ use std::cell::RefCell;
 use std::hash::{Hash, Hasher, SipHasher};
 use std::io::prelude::*;
 use std::io::{Cursor, SeekFrom};
+use rbml::writer::Encoder;
+use rustc_ast_map as ast_map;
+use rustc_ast_map::{LinkedPath, PathElem, PathElems};
 use syntax::abi;
 use syntax::ast::{self, DefId, NodeId};
-use syntax::ast_map::{self, LinkedPath, PathElem, PathElems};
 use syntax::ast_util::*;
 use syntax::ast_util;
 use syntax::attr;
@@ -47,7 +49,6 @@ use syntax::ptr::P;
 use syntax::visit::Visitor;
 use syntax::visit;
 use syntax;
-use rbml::writer::Encoder;
 
 /// A borrowed version of `ast::InlinedItem`.
 pub enum InlinedItemRef<'a> {

src/librustc/middle/astencode.rs

@@ -31,12 +31,11 @@ use middle::subst::VecPerParamSpace;
 use middle::ty::{self, Ty, MethodCall, MethodCallee, MethodOrigin};
 use util::ppaux::ty_to_string;
 
-use syntax::{ast, ast_map, ast_util, codemap, fold};
+use syntax::{self, ast, ast_util, codemap, fold};
 use syntax::codemap::Span;
 use syntax::fold::Folder;
 use syntax::parse::token;
 use syntax::ptr::P;
-use syntax;
 
 use std::cell::Cell;
 use std::io::SeekFrom;
@@ -46,6 +45,7 @@ use std::fmt::Debug;
 use rbml::reader;
 use rbml::writer::Encoder;
 use rbml;
+use rustc_ast_map as ast_map;
 use serialize;
 use serialize::{Decodable, Decoder, DecoderHelpers, Encodable};
 use serialize::EncoderHelpers;

src/librustc/middle/cfg/graphviz.rs

@@ -16,8 +16,8 @@ use std::borrow::IntoCow;
 // For clarity, rename the graphviz crate locally to dot.
 use graphviz as dot;
 
+use rustc_ast_map as ast_map;
 use syntax::ast;
-use syntax::ast_map;
 
 use middle::cfg;
 

src/librustc/middle/check_static_recursion.rs

@@ -14,8 +14,9 @@
 use session::Session;
 use middle::def::{DefStatic, DefConst, DefAssociatedConst, DefMap};
 
+use rustc_ast_map as ast_map;
 use syntax::ast;
-use syntax::{ast_util, ast_map};
+use syntax::ast_util;
 use syntax::codemap::Span;
 use syntax::visit::Visitor;
 use syntax::visit;

src/librustc/middle/const_eval.rs

@@ -23,12 +23,13 @@ use middle::astconv_util::ast_ty_to_prim_ty;
 use util::num::ToPrimitive;
 use util::ppaux::Repr;
 
+use rustc_ast_map as ast_map;
 use syntax::ast::{self, Expr};
 use syntax::codemap::Span;
 use syntax::feature_gate;
 use syntax::parse::token::InternedString;
 use syntax::ptr::P;
-use syntax::{ast_map, ast_util, codemap};
+use syntax::{ast_util, codemap};
 
 use std::borrow::{Cow, IntoCow};
 use std::num::wrapping::OverflowingOps;

src/librustc/middle/dead.rs

@@ -17,7 +17,8 @@ use lint;
 use util::nodemap::NodeSet;
 
 use std::collections::HashSet;
-use syntax::{ast, ast_map, codemap};
+use rustc_ast_map as ast_map;
+use syntax::{ast, codemap};
 use syntax::ast_util::{local_def, is_local};
 use syntax::attr::{self, AttrMetaMethods};
 use syntax::visit::{self, Visitor};