Skip to content

Commit fec0421

Browse files
committed
syntax: Move ast_map into it's own crate
This lets us remove the arena dependency from libsyntax, which is unstable.
1 parent 6b29a7d commit fec0421

File tree

47 files changed

+119
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+119
-79
lines changed

mk/crates.mk

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ TARGET_CRATES := libc std flate arena term \
5656
RUSTC_CRATES := rustc rustc_typeck rustc_borrowck rustc_resolve rustc_driver \
5757
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
5858
rustc_data_structures
59-
HOST_CRATES := syntax $(RUSTC_CRATES) rustdoc fmt_macros
59+
SYNTAX_CRATES := syntax syntax_ast_map
60+
HOST_CRATES := $(SYNTAX_CRATES) $(RUSTC_CRATES) rustdoc fmt_macros
6061
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
6162
TOOLS := compiletest rustdoc rustc rustbook
6263

@@ -68,24 +69,25 @@ DEPS_std := core libc rand alloc collections rustc_unicode \
6869
native:rust_builtin native:backtrace native:rustrt_native \
6970
rustc_bitflags
7071
DEPS_graphviz := std
71-
DEPS_syntax := std term serialize log fmt_macros arena libc
72+
DEPS_syntax := std term serialize log fmt_macros libc
73+
DEPS_syntax_ast_map := std arena syntax
7274
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
73-
rustc_typeck rustc_resolve log syntax serialize rustc_llvm \
74-
rustc_trans rustc_privacy rustc_lint
75+
rustc_typeck rustc_resolve log syntax syntax_ast_map serialize \
76+
rustc_llvm rustc_trans rustc_privacy rustc_lint
7577

7678
DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back \
77-
log syntax serialize rustc_llvm
78-
DEPS_rustc_typeck := rustc syntax
79-
DEPS_rustc_borrowck := rustc log graphviz syntax
80-
DEPS_rustc_resolve := rustc log syntax
81-
DEPS_rustc_privacy := rustc log syntax
82-
DEPS_rustc_lint := rustc log syntax
83-
DEPS_rustc := syntax flate arena serialize getopts rbml \
79+
log syntax syntax_ast_map serialize rustc_llvm
80+
DEPS_rustc_typeck := rustc syntax syntax_ast_map
81+
DEPS_rustc_borrowck := rustc log graphviz syntax syntax_ast_map
82+
DEPS_rustc_resolve := rustc log syntax syntax_ast_map
83+
DEPS_rustc_privacy := rustc log syntax syntax_ast_map
84+
DEPS_rustc_lint := rustc log syntax syntax_ast_map
85+
DEPS_rustc := syntax syntax_ast_map flate arena serialize getopts rbml \
8486
log graphviz rustc_llvm rustc_back rustc_data_structures
8587
DEPS_rustc_llvm := native:rustllvm libc std
8688
DEPS_rustc_back := std syntax rustc_llvm flate log libc
8789
DEPS_rustc_data_structures := std log serialize
88-
DEPS_rustdoc := rustc rustc_driver native:hoedown serialize getopts \
90+
DEPS_rustdoc := rustc rustc_driver native:hoedown syntax syntax_ast_map serialize getopts \
8991
test rustc_lint
9092
DEPS_rustc_bitflags := core
9193
DEPS_flate := std native:miniz

src/librustc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ extern crate rbml;
5959
extern crate collections;
6060
#[macro_use] extern crate log;
6161
#[macro_use] extern crate syntax;
62+
extern crate syntax_ast_map;
6263
#[macro_use] #[no_link] extern crate rustc_bitflags;
6364

6465
extern crate serialize as rustc_serialize; // used by deriving

src/librustc/metadata/csearch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ use rbml;
2121
use rbml::reader;
2222
use std::rc::Rc;
2323
use syntax::ast;
24-
use syntax::ast_map;
2524
use syntax::attr;
2625
use syntax::attr::AttrMetaMethods;
2726
use syntax::diagnostic::expect;
2827
use syntax::parse::token;
28+
use syntax_ast_map as ast_map;
2929

3030
use std::collections::hash_map::HashMap;
3131

src/librustc/metadata/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ use std::str;
4242
use rbml::reader;
4343
use rbml;
4444
use serialize::Decodable;
45-
use syntax::ast_map;
4645
use syntax::attr;
4746
use syntax::parse::token::{IdentInterner, special_idents};
4847
use syntax::parse::token;
4948
use syntax::print::pprust;
5049
use syntax::ast;
5150
use syntax::codemap;
5251
use syntax::ptr::P;
52+
use syntax_ast_map as ast_map;
5353

5454
pub type Cmd<'a> = &'a crate_metadata;
5555

src/librustc/metadata/encoder.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ use std::io::prelude::*;
3434
use std::io::{Cursor, SeekFrom};
3535
use syntax::abi;
3636
use syntax::ast::{self, DefId, NodeId};
37-
use syntax::ast_map::{self, LinkedPath, PathElem, PathElems};
3837
use syntax::ast_util::*;
3938
use syntax::ast_util;
4039
use syntax::attr;
@@ -47,6 +46,8 @@ use syntax::ptr::P;
4746
use syntax::visit::Visitor;
4847
use syntax::visit;
4948
use syntax;
49+
use syntax_ast_map as ast_map;
50+
use syntax_ast_map::{LinkedPath, PathElem, PathElems};
5051
use rbml::writer::Encoder;
5152

5253
/// A borrowed version of `ast::InlinedItem`.

src/librustc/middle/astencode.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ use middle::subst::VecPerParamSpace;
3131
use middle::ty::{self, Ty, MethodCall, MethodCallee, MethodOrigin};
3232
use util::ppaux::ty_to_string;
3333

34-
use syntax::{ast, ast_map, ast_util, codemap, fold};
34+
use syntax::{ast, ast_util, codemap, fold};
3535
use syntax::codemap::Span;
3636
use syntax::fold::Folder;
3737
use syntax::parse::token;
3838
use syntax::ptr::P;
3939
use syntax;
40+
use syntax_ast_map as ast_map;
4041

4142
use std::cell::Cell;
4243
use std::io::SeekFrom;

src/librustc/middle/cfg/graphviz.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use std::borrow::IntoCow;
1717
use graphviz as dot;
1818

1919
use syntax::ast;
20-
use syntax::ast_map;
20+
use syntax_ast_map as ast_map;
2121

2222
use middle::cfg;
2323

src/librustc/middle/check_static_recursion.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ use session::Session;
1515
use middle::def::{DefStatic, DefConst, DefMap};
1616

1717
use syntax::ast;
18-
use syntax::{ast_util, ast_map};
18+
use syntax::ast_util;
1919
use syntax::visit::Visitor;
2020
use syntax::visit;
21+
use syntax_ast_map as ast_map;
2122

2223
struct CheckCrateVisitor<'a, 'ast: 'a> {
2324
sess: &'a Session,

src/librustc/middle/const_eval.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ use syntax::codemap::Span;
2727
use syntax::feature_gate;
2828
use syntax::parse::token::InternedString;
2929
use syntax::ptr::P;
30-
use syntax::{ast_map, ast_util, codemap};
30+
use syntax::{ast_util, codemap};
31+
use syntax_ast_map as ast_map;
3132

3233
use std::borrow::{Cow, IntoCow};
3334
use std::num::wrapping::OverflowingOps;

src/librustc/middle/dead.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ use lint;
1717
use util::nodemap::NodeSet;
1818

1919
use std::collections::HashSet;
20-
use syntax::{ast, ast_map, codemap};
20+
use syntax::{ast, codemap};
2121
use syntax::ast_util::{local_def, is_local};
2222
use syntax::attr::{self, AttrMetaMethods};
2323
use syntax::visit::{self, Visitor};
24+
use syntax_ast_map as ast_map;
2425

2526
// Any local node that may call something in its body block should be
2627
// explored. For example, if it's a live NodeItem that is a

0 commit comments

Comments
 (0)