Skip to content

Commit a2823e3

Browse files
committed
Rename libsyntax_ext and libsyntax_expand in code
1 parent b9a9c5b commit a2823e3

Some content is hidden

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

52 files changed

+69
-72
lines changed

src/librustc_builtin_macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ rustc_parse = { path = "../librustc_parse" }
1919
rustc_target = { path = "../librustc_target" }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
2121
syntax = { path = "../libsyntax" }
22-
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
22+
rustc_expand = { path = "../librustc_expand" }
2323
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2424
rustc_error_codes = { path = "../librustc_error_codes" }

src/librustc_builtin_macros/asm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
use State::*;
44

55
use errors::{DiagnosticBuilder, PResult};
6+
use rustc_expand::base::*;
67
use rustc_parse::parser::Parser;
78
use syntax::ast::{self, AsmDialect};
89
use syntax::ptr::P;
910
use syntax::symbol::{kw, sym, Symbol};
1011
use syntax::token::{self, Token};
1112
use syntax::tokenstream::{self, TokenStream};
1213
use syntax::{span_err, struct_span_err};
13-
use syntax_expand::base::*;
1414
use syntax_pos::Span;
1515

1616
use rustc_error_codes::*;

src/librustc_builtin_macros/assert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
use errors::{Applicability, DiagnosticBuilder};
22

3+
use rustc_expand::base::*;
34
use rustc_parse::parser::Parser;
45
use syntax::ast::{self, *};
56
use syntax::print::pprust;
67
use syntax::ptr::P;
78
use syntax::symbol::{sym, Symbol};
89
use syntax::token::{self, TokenKind};
910
use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
10-
use syntax_expand::base::*;
1111
use syntax_pos::{Span, DUMMY_SP};
1212

1313
pub fn expand_assert<'cx>(

src/librustc_builtin_macros/cfg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
/// current compilation environment.
44
use errors::DiagnosticBuilder;
55

6+
use rustc_expand::base::{self, *};
67
use syntax::ast;
78
use syntax::attr;
89
use syntax::token;
910
use syntax::tokenstream::TokenStream;
10-
use syntax_expand::base::{self, *};
1111
use syntax_pos::Span;
1212

1313
pub fn expand_cfg(

src/librustc_builtin_macros/cmdline_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Attributes injected into the crate root from command line using `-Z crate-attr`.
22
3+
use rustc_expand::panictry;
34
use syntax::ast::{self, AttrItem, AttrStyle};
45
use syntax::attr::mk_attr;
56
use syntax::sess::ParseSess;
67
use syntax::token;
7-
use syntax_expand::panictry;
88
use syntax_pos::FileName;
99

1010
pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -> ast::Crate {

src/librustc_builtin_macros/compile_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// The compiler code necessary to support the compile_error! extension.
22

3+
use rustc_expand::base::{self, *};
34
use syntax::tokenstream::TokenStream;
4-
use syntax_expand::base::{self, *};
55
use syntax_pos::Span;
66

77
pub fn expand_compile_error<'cx>(

src/librustc_builtin_macros/concat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use rustc_expand::base::{self, DummyResult};
12
use syntax::ast;
23
use syntax::symbol::Symbol;
34
use syntax::tokenstream::TokenStream;
4-
use syntax_expand::base::{self, DummyResult};
55

66
use std::string::String;
77

src/librustc_builtin_macros/concat_idents.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
use rustc_expand::base::{self, *};
12
use syntax::ast;
23
use syntax::ptr::P;
34
use syntax::token::{self, Token};
45
use syntax::tokenstream::{TokenStream, TokenTree};
5-
use syntax_expand::base::{self, *};
66
use syntax_pos::symbol::Symbol;
77
use syntax_pos::Span;
88

src/librustc_builtin_macros/deriving/bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use crate::deriving::generic::ty::*;
22
use crate::deriving::generic::*;
33
use crate::deriving::path_std;
44

5+
use rustc_expand::base::{Annotatable, ExtCtxt};
56
use syntax::ast::MetaItem;
6-
use syntax_expand::base::{Annotatable, ExtCtxt};
77
use syntax_pos::Span;
88

99
pub fn expand_deriving_copy(

src/librustc_builtin_macros/deriving/clone.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
22
use crate::deriving::generic::*;
33
use crate::deriving::path_std;
44

5+
use rustc_expand::base::{Annotatable, ExtCtxt};
56
use syntax::ast::{self, Expr, GenericArg, Generics, ItemKind, MetaItem, VariantData};
67
use syntax::ptr::P;
78
use syntax::symbol::{kw, sym, Symbol};
8-
use syntax_expand::base::{Annotatable, ExtCtxt};
99
use syntax_pos::Span;
1010

1111
pub fn expand_deriving_clone(

0 commit comments

Comments
 (0)