Skip to content

Commit 2917d99

Browse files
committed
Auto merge of #69592 - petrochenkov:nosyntax, r=Centril
Rename `libsyntax` to `librustc_ast` This was the last rustc crate that wasn't following the `rustc_*` naming convention. Follow-up to #67763.
2 parents d3c7934 + e08c279 commit 2917d99

File tree

327 files changed

+722
-709
lines changed

Some content is hidden

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

327 files changed

+722
-709
lines changed

Cargo.lock

Lines changed: 43 additions & 43 deletions
Large diffs are not rendered by default.

src/bootstrap/dist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ impl Step for Src {
996996
"src/tools/rustc-std-workspace-alloc",
997997
"src/tools/rustc-std-workspace-std",
998998
"src/librustc",
999-
"src/libsyntax",
999+
"src/librustc_ast",
10001000
];
10011001

10021002
copy_src_dirs(builder, &std_src_dirs[..], &[], &dst_src);

src/doc/rustc-ux-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ for details on how to format and write long error codes.
6262
* All of them are accessible [online](http://doc.rust-lang.org/error-index.html),
6363
which are auto-generated from rustc source code in different places:
6464
[librustc](https://github.com/rust-lang/rust/blob/master/src/librustc/error_codes.rs),
65-
[libsyntax](https://github.com/rust-lang/rust/blob/master/src/libsyntax/error_codes.rs),
65+
[librustc_ast](https://github.com/rust-lang/rust/blob/master/src/librustc_ast/error_codes.rs),
6666
[librustc_borrowck](https://github.com/rust-lang/rust/blob/master/src/librustc_borrowck/error_codes.rs),
6767
[librustc_metadata](https://github.com/rust-lang/rust/blob/master/src/librustc_metadata/error_codes.rs),
6868
[librustc_mir](https://github.com/rust-lang/rust/blob/master/src/librustc_mir/error_codes.rs),

src/doc/unstable-book/src/language-features/plugin.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ mechanics of defining and loading a plugin.
2323

2424
In the vast majority of cases, a plugin should *only* be used through
2525
`#![plugin]` and not through an `extern crate` item. Linking a plugin would
26-
pull in all of libsyntax and librustc as dependencies of your crate. This is
26+
pull in all of librustc_ast and librustc as dependencies of your crate. This is
2727
generally unwanted unless you are building another plugin.
2828

2929
The usual practice is to put compiler plugins in their own crate, separate from
@@ -42,7 +42,7 @@ that warns about any item named `lintme`.
4242
#![feature(plugin_registrar)]
4343
#![feature(box_syntax, rustc_private)]
4444
45-
extern crate syntax;
45+
extern crate rustc_ast;
4646
4747
// Load rustc as a plugin to get macros
4848
#[macro_use]
@@ -52,7 +52,7 @@ extern crate rustc_driver;
5252
use rustc::lint::{EarlyContext, LintContext, LintPass, EarlyLintPass,
5353
EarlyLintPassObject, LintArray};
5454
use rustc_driver::plugin::Registry;
55-
use syntax::ast;
55+
use rustc_ast::ast;
5656
5757
declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
5858

src/librustc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
2828
rustc_errors = { path = "../librustc_errors" }
2929
rustc_index = { path = "../librustc_index" }
3030
rustc_serialize = { path = "../libserialize", package = "serialize" }
31-
syntax = { path = "../libsyntax" }
31+
rustc_ast = { path = "../librustc_ast" }
3232
rustc_span = { path = "../librustc_span" }
3333
backtrace = "0.3.40"
3434
parking_lot = "0.9"

src/librustc/arena.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ macro_rules! arena_types {
131131
// HIR types
132132
[few] hir_krate: rustc_hir::Crate<$tcx>,
133133
[] arm: rustc_hir::Arm<$tcx>,
134-
[] attribute: syntax::ast::Attribute,
134+
[] attribute: rustc_ast::ast::Attribute,
135135
[] block: rustc_hir::Block<$tcx>,
136136
[] bare_fn_ty: rustc_hir::BareFnTy<$tcx>,
137137
[few] global_asm: rustc_hir::GlobalAsm,

src/librustc/dep_graph/safe.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
33
use crate::ty::TyCtxt;
44

5+
use rustc_ast::ast::NodeId;
56
use rustc_hir::def_id::DefId;
67
use rustc_hir::BodyId;
7-
use syntax::ast::NodeId;
88

99
/// The `DepGraphSafe` trait is used to specify what kinds of values
1010
/// are safe to "leak" into a task. The idea is that this should be

src/librustc/hir/exports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::ty;
22

3+
use rustc_ast::ast;
34
use rustc_hir::def::Res;
45
use rustc_hir::def_id::DefIdMap;
56
use rustc_macros::HashStable;
67
use rustc_span::Span;
7-
use syntax::ast;
88

99
use std::fmt::Debug;
1010

src/librustc/hir/map/blocks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
//! for the `Code` associated with a particular NodeId.
1313
1414
use crate::hir::map::Map;
15+
use rustc_ast::ast::{Attribute, Ident};
1516
use rustc_hir as hir;
1617
use rustc_hir::intravisit::FnKind;
1718
use rustc_hir::{Expr, FnDecl, Node};
1819
use rustc_span::Span;
19-
use syntax::ast::{Attribute, Ident};
2020

2121
/// An FnLikeNode is a Node that is like a fn, in that it has a decl
2222
/// and a body (as well as a NodeId, a span, etc).

src/librustc/hir/map/collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::hir::map::definitions::{self, DefPathHash};
33
use crate::hir::map::{Entry, HirEntryMap, Map};
44
use crate::ich::StableHashingContext;
55
use crate::middle::cstore::CrateStore;
6+
use rustc_ast::ast::NodeId;
67
use rustc_data_structures::fingerprint::Fingerprint;
78
use rustc_data_structures::fx::FxHashMap;
89
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
@@ -16,7 +17,6 @@ use rustc_index::vec::IndexVec;
1617
use rustc_session::{CrateDisambiguator, Session};
1718
use rustc_span::source_map::SourceMap;
1819
use rustc_span::{Span, Symbol, DUMMY_SP};
19-
use syntax::ast::NodeId;
2020

2121
use std::iter::repeat;
2222

0 commit comments

Comments
 (0)