Auto merge of #67707 - petrochenkov:crateren, r=Centril

Rename some crates and modules in the frontend

Migrate from `syntax_*` naming scheme to `rustc_*`.
See #65324 (comment) and several comments below.

Renamed crates:
`syntax_expand` -> `rustc_expand`
`syntax_pos` -> `rustc_span` ([motivation](#65324 (comment)))
`syntax_ext` -> `rustc_builtin_macros`

Also one module in resolve is renamed for consistency and to avoid tautology.

r? @Centril

Author: bors

Diff for: Cargo.lock

@@ -9,5 +9,5 @@ name = "fmt_macros"
 path = "lib.rs"
 
 [dependencies]
-syntax_pos = { path = "../libsyntax_pos" }
+syntax_pos = { path = "../librustc_span", package = "rustc_span" }
 rustc_lexer = { path = "../librustc_lexer" }

Diff for: src/libfmt_macros/Cargo.toml

@@ -30,7 +30,7 @@ rustc_index = { path = "../librustc_index" }
 errors = { path = "../librustc_errors", package = "rustc_errors" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 syntax = { path = "../libsyntax" }
-syntax_pos = { path = "../libsyntax_pos" }
+syntax_pos = { path = "../librustc_span", package = "rustc_span" }
 backtrace = "0.3.40"
 parking_lot = "0.9"
 byteorder = { version = "1.3" }

Diff for: src/librustc/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "syntax_ext"
+name = "rustc_builtin_macros"
 version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "syntax_ext"
+name = "rustc_builtin_macros"
 path = "lib.rs"
 doctest = false
 
@@ -19,6 +19,6 @@ rustc_parse = { path = "../librustc_parse" }
 rustc_target = { path = "../librustc_target" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 syntax = { path = "../libsyntax" }
-syntax_expand = { path = "../libsyntax_expand" }
-syntax_pos = { path = "../libsyntax_pos" }
+rustc_expand = { path = "../librustc_expand" }
+syntax_pos = { path = "../librustc_span", package = "rustc_span" }
 rustc_error_codes = { path = "../librustc_error_codes" }

Diff for: src/libsyntax_ext/Cargo.toml renamed to src/librustc_builtin_macros/Cargo.toml

@@ -3,14 +3,14 @@
 use State::*;
 
 use errors::{DiagnosticBuilder, PResult};
+use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
 use syntax::ast::{self, AsmDialect};
 use syntax::ptr::P;
 use syntax::symbol::{kw, sym, Symbol};
 use syntax::token::{self, Token};
 use syntax::tokenstream::{self, TokenStream};
 use syntax::{span_err, struct_span_err};
-use syntax_expand::base::*;
 use syntax_pos::Span;
 
 use rustc_error_codes::*;

Diff for: src/libsyntax_ext/asm.rs renamed to src/librustc_builtin_macros/asm.rs

@@ -1,13 +1,13 @@
 use errors::{Applicability, DiagnosticBuilder};
 
+use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
 use syntax::ast::{self, *};
 use syntax::print::pprust;
 use syntax::ptr::P;
 use syntax::symbol::{sym, Symbol};
 use syntax::token::{self, TokenKind};
 use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
-use syntax_expand::base::*;
 use syntax_pos::{Span, DUMMY_SP};
 
 pub fn expand_assert<'cx>(

Diff for: src/libsyntax_ext/assert.rs renamed to src/librustc_builtin_macros/assert.rs

@@ -3,11 +3,11 @@
 /// current compilation environment.
 use errors::DiagnosticBuilder;
 
+use rustc_expand::base::{self, *};
 use syntax::ast;
 use syntax::attr;
 use syntax::token;
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, *};
 use syntax_pos::Span;
 
 pub fn expand_cfg(

Diff for: src/libsyntax_ext/cfg.rs renamed to src/librustc_builtin_macros/cfg.rs

@@ -1,10 +1,10 @@
 //! Attributes injected into the crate root from command line using `-Z crate-attr`.
 
+use rustc_expand::panictry;
 use syntax::ast::{self, AttrItem, AttrStyle};
 use syntax::attr::mk_attr;
 use syntax::sess::ParseSess;
 use syntax::token;
-use syntax_expand::panictry;
 use syntax_pos::FileName;
 
 pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -> ast::Crate {

Diff for: src/libsyntax_ext/cmdline_attrs.rs renamed to src/librustc_builtin_macros/cmdline_attrs.rs

@@ -1,7 +1,7 @@
 // The compiler code necessary to support the compile_error! extension.
 
+use rustc_expand::base::{self, *};
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, *};
 use syntax_pos::Span;
 
 pub fn expand_compile_error<'cx>(

Diff for: src/libsyntax_ext/compile_error.rs renamed to src/librustc_builtin_macros/compile_error.rs

@@ -1,7 +1,7 @@
+use rustc_expand::base::{self, DummyResult};
 use syntax::ast;
 use syntax::symbol::Symbol;
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, DummyResult};
 
 use std::string::String;
 

Diff for: src/libsyntax_ext/concat.rs renamed to src/librustc_builtin_macros/concat.rs

@@ -1,8 +1,8 @@
+use rustc_expand::base::{self, *};
 use syntax::ast;
 use syntax::ptr::P;
 use syntax::token::{self, Token};
 use syntax::tokenstream::{TokenStream, TokenTree};
-use syntax_expand::base::{self, *};
 use syntax_pos::symbol::Symbol;
 use syntax_pos::Span;
 

Diff for: src/libsyntax_ext/concat_idents.rs renamed to src/librustc_builtin_macros/concat_idents.rs

@@ -2,8 +2,8 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::MetaItem;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_copy(

Diff for: src/libsyntax_ext/deriving/bounds.rs renamed to src/librustc_builtin_macros/deriving/bounds.rs

@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, Expr, GenericArg, Generics, ItemKind, MetaItem, VariantData};
 use syntax::ptr::P;
 use syntax::symbol::{kw, sym, Symbol};
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_clone(

Diff for: src/libsyntax_ext/deriving/clone.rs renamed to src/librustc_builtin_macros/deriving/clone.rs

@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, Expr, GenericArg, Ident, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::{sym, Symbol};
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_eq(

Diff for: src/libsyntax_ext/deriving/cmp/eq.rs renamed to src/librustc_builtin_macros/deriving/cmp/eq.rs

@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::sym;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_ord(

Diff for: src/libsyntax_ext/deriving/cmp/ord.rs renamed to src/librustc_builtin_macros/deriving/cmp/ord.rs

@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std};
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{BinOpKind, Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::sym;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_partial_eq(

Diff for: src/libsyntax_ext/deriving/cmp/partial_eq.rs renamed to src/librustc_builtin_macros/deriving/cmp/partial_eq.rs

@@ -4,10 +4,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std, pathvec_std};
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, BinOpKind, Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::{sym, Symbol};
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_partial_ord(

Diff for: src/libsyntax_ext/deriving/cmp/partial_ord.rs renamed to src/librustc_builtin_macros/deriving/cmp/partial_ord.rs

@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, Ident};
 use syntax::ast::{Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::sym;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::{Span, DUMMY_SP};
 
 pub fn expand_deriving_debug(

Diff for: src/libsyntax_ext/deriving/debug.rs renamed to src/librustc_builtin_macros/deriving/debug.rs

@@ -4,11 +4,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast;
 use syntax::ast::{Expr, MetaItem, Mutability};
 use syntax::ptr::P;
 use syntax::symbol::Symbol;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_rustc_decodable(

Diff for: src/libsyntax_ext/deriving/decodable.rs renamed to src/librustc_builtin_macros/deriving/decodable.rs

@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_expand::base::{Annotatable, DummyResult, ExtCtxt};
 use syntax::ast::{Expr, MetaItem};
 use syntax::ptr::P;
 use syntax::span_err;
 use syntax::symbol::{kw, sym};
-use syntax_expand::base::{Annotatable, DummyResult, ExtCtxt};
 use syntax_pos::Span;
 
 use rustc_error_codes::*;

Diff for: src/libsyntax_ext/deriving/default.rs renamed to src/librustc_builtin_macros/deriving/default.rs

@@ -89,10 +89,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{Expr, ExprKind, MetaItem, Mutability};
 use syntax::ptr::P;
 use syntax::symbol::Symbol;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_rustc_encodable(

Diff for: src/libsyntax_ext/deriving/encodable.rs renamed to src/librustc_builtin_macros/deriving/encodable.rs

@@ -181,6 +181,7 @@ use std::cell::RefCell;
 use std::iter;
 use std::vec;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, BinOpKind, EnumDef, Expr, Generics, Ident, PatKind};
 use syntax::ast::{GenericArg, GenericParamKind, VariantData};
 use syntax::attr;
@@ -189,7 +190,6 @@ use syntax::sess::ParseSess;
 use syntax::source_map::respan;
 use syntax::symbol::{kw, sym, Symbol};
 use syntax::util::map_in_place::MapInPlace;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 use ty::{LifetimeBounds, Path, Ptr, PtrTy, Self_, Ty};
@@ -412,8 +412,8 @@ impl<'a> TraitDef<'a> {
                     _ => {
                         // Non-ADT derive is an error, but it should have been
                         // set earlier; see
-                        // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
-                        // libsyntax_expand/base.rs:Annotatable::derive_allowed()
+                        // librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
+                        // librustc_expand/base.rs:Annotatable::derive_allowed()
                         return;
                     }
                 };
@@ -487,8 +487,8 @@ impl<'a> TraitDef<'a> {
             _ => {
                 // Non-Item derive is an error, but it should have been
                 // set earlier; see
-                // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
-                // libsyntax_expand/base.rs:Annotatable::derive_allowed()
+                // librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
+                // librustc_expand/base.rs:Annotatable::derive_allowed()
                 return;
             }
         }

Diff for: src/libsyntax_ext/deriving/generic/mod.rs renamed to src/librustc_builtin_macros/deriving/generic/mod.rs

@@ -4,10 +4,10 @@
 pub use PtrTy::*;
 pub use Ty::*;
 
+use rustc_expand::base::ExtCtxt;
 use syntax::ast::{self, Expr, GenericArg, GenericParamKind, Generics, Ident, SelfKind};
 use syntax::ptr::P;
 use syntax::source_map::{respan, DUMMY_SP};
-use syntax_expand::base::ExtCtxt;
 use syntax_pos::symbol::kw;
 use syntax_pos::Span;
 

Diff for: src/libsyntax_ext/deriving/generic/ty.rs renamed to src/librustc_builtin_macros/deriving/generic/ty.rs

@@ -2,10 +2,10 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{self, path_std, pathvec_std};
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{Expr, MetaItem, Mutability};
 use syntax::ptr::P;
 use syntax::symbol::sym;
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand_deriving_hash(

Diff for: src/libsyntax_ext/deriving/hash.rs renamed to src/librustc_builtin_macros/deriving/hash.rs

@@ -1,9 +1,9 @@
 //! The compiler code necessary to implement the `#[derive]` extensions.
 
+use rustc_expand::base::{Annotatable, ExtCtxt, MultiItemModifier};
 use syntax::ast::{self, ItemKind, MetaItem};
 use syntax::ptr::P;
 use syntax::symbol::{sym, Symbol};
-use syntax_expand::base::{Annotatable, ExtCtxt, MultiItemModifier};
 use syntax_pos::Span;
 
 macro path_local($x:ident) {
@@ -92,8 +92,8 @@ fn inject_impl_of_structural_trait(
         _ => {
             // Non-Item derive is an error, but it should have been
             // set earlier; see
-            // libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
-            // libsyntax_expand/base.rs:Annotatable::derive_allowed()
+            // librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
+            // librustc_expand/base.rs:Annotatable::derive_allowed()
             return;
         }
     };

Diff for: src/libsyntax_ext/deriving/mod.rs renamed to src/librustc_builtin_macros/deriving/mod.rs

@@ -3,10 +3,10 @@
 // interface.
 //
 
+use rustc_expand::base::{self, *};
 use syntax::ast::{self, GenericArg, Ident};
 use syntax::symbol::{kw, sym, Symbol};
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, *};
 use syntax_pos::Span;
 
 use std::env;

Diff for: src/libsyntax_ext/env.rs renamed to src/librustc_builtin_macros/env.rs

@@ -7,12 +7,12 @@ use errors::pluralize;
 use errors::Applicability;
 use errors::DiagnosticBuilder;
 
+use rustc_expand::base::{self, *};
 use syntax::ast;
 use syntax::ptr::P;
 use syntax::symbol::{sym, Symbol};
 use syntax::token;
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, *};
 use syntax_pos::{MultiSpan, Span};
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};

Diff for: src/libsyntax_ext/format.rs renamed to src/librustc_builtin_macros/format.rs

@@ -1,11 +1,11 @@
 use crate::util::check_builtin_macro_attribute;
 
+use rustc_expand::base::{Annotatable, ExtCtxt};
 use syntax::ast::{self, Attribute, Expr, FnHeader, FnSig, Generics, Ident, Param};
 use syntax::ast::{ItemKind, Mutability, Stmt, Ty, TyKind, Unsafety};
 use syntax::expand::allocator::{AllocatorKind, AllocatorMethod, AllocatorTy, ALLOCATOR_METHODS};
 use syntax::ptr::P;
 use syntax::symbol::{kw, sym, Symbol};
-use syntax_expand::base::{Annotatable, ExtCtxt};
 use syntax_pos::Span;
 
 pub fn expand(

Diff for: src/libsyntax_ext/format_foreign.rs renamed to src/librustc_builtin_macros/format_foreign.rs

@@ -9,13 +9,13 @@
 /// therefore apply.
 use errors::DiagnosticBuilder;
 
+use rustc_expand::base::{self, *};
 use smallvec::smallvec;
 use syntax::ast;
 use syntax::ptr::P;
 use syntax::source_map::respan;
 use syntax::token;
 use syntax::tokenstream::TokenStream;
-use syntax_expand::base::{self, *};
 use syntax_pos::Span;
 
 pub fn expand_global_asm<'cx>(

Diff for: src/libsyntax_ext/format_foreign/printf/tests.rs renamed to src/librustc_builtin_macros/format_foreign/printf/tests.rs

@@ -13,11 +13,11 @@ extern crate proc_macro;
 
 use crate::deriving::*;
 
+use rustc_expand::base::{MacroExpanderFn, Resolver, SyntaxExtension, SyntaxExtensionKind};
+use rustc_expand::proc_macro::BangProcMacro;
 use syntax::ast::Ident;
 use syntax::edition::Edition;
 use syntax::symbol::sym;
-use syntax_expand::base::{MacroExpanderFn, Resolver, SyntaxExtension, SyntaxExtensionKind};
-use syntax_expand::proc_macro::BangProcMacro;
 
 mod asm;
 mod assert;