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

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" }

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" }

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" }

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::*;

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>(

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(

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 {

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>(

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;