Skip to content

Commit 6054a30

Browse files
petrochenkovpetrochenkov
committed
Make it build again
1 parent e94d3b7 commit 6054a30

File tree

56 files changed

+101
-101
lines changed

Some content is hidden

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

56 files changed

+101
-101
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

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

Lines changed: 1 addition & 1 deletion

‎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+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
3232
rustc_span = { path = "../librustc_span" }
3333
backtrace = "0.3.40"
3434
parking_lot = "0.9"

‎src/librustc/ich/impls_syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! This module contains `HashStable` implementations for various data types
2-
//! from libsyntax in no particular order.
2+
//! from librustc_ast in no particular order.
33
44
use crate::ich::StableHashingContext;
55

‎src/librustc/ty/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ pub mod tls {
17201720
set_tlv(context as *const _ as usize, || f(&context))
17211721
}
17221722

1723-
/// Enters `GlobalCtxt` by setting up libsyntax callbacks and
1723+
/// Enters `GlobalCtxt` by setting up librustc_ast callbacks and
17241724
/// creating a initial `TyCtxt` and `ImplicitCtxt`.
17251725
/// This happens once per rustc session and `TyCtxt`s only exists
17261726
/// inside the `f` function.

‎src/librustc/ty/sty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ impl BoundRegion {
118118
}
119119

120120
/// N.B., if you change this, you'll probably want to change the corresponding
121-
/// AST structure in `libsyntax/ast.rs` as well.
121+
/// AST structure in `librustc_ast/ast.rs` as well.
122122
#[derive(
123123
Clone,
124124
PartialEq,

‎src/librustc_ast/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
name = "syntax"
3+
name = "rustc_ast"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "syntax"
8+
name = "rustc_ast"
99
path = "lib.rs"
1010
doctest = false
1111

‎src/librustc_ast_lowering/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ rustc_index = { path = "../librustc_index" }
2020
rustc_span = { path = "../librustc_span" }
2121
rustc_errors = { path = "../librustc_errors" }
2222
rustc_session = { path = "../librustc_session" }
23-
syntax = { path = "../libsyntax" }
23+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2424
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_ast_passes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ rustc_feature = { path = "../librustc_feature" }
1818
rustc_parse = { path = "../librustc_parse" }
1919
rustc_session = { path = "../librustc_session" }
2020
rustc_span = { path = "../librustc_span" }
21-
syntax = { path = "../libsyntax" }
21+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_ast_pretty/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ doctest = false
1313
log = "0.4"
1414
rustc_span = { path = "../librustc_span" }
1515
rustc_data_structures = { path = "../librustc_data_structures" }
16-
syntax = { path = "../libsyntax" }
16+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_attr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ rustc_feature = { path = "../librustc_feature" }
1919
rustc_macros = { path = "../librustc_macros" }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
2121
rustc_session = { path = "../librustc_session" }
22-
syntax = { path = "../libsyntax" }
22+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_builtin_macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ rustc_parse = { path = "../librustc_parse" }
2121
rustc_target = { path = "../librustc_target" }
2222
rustc_session = { path = "../librustc_session" }
2323
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
24-
syntax = { path = "../libsyntax" }
24+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2525
rustc_expand = { path = "../librustc_expand" }
2626
rustc_span = { path = "../librustc_span" }

‎src/librustc_codegen_llvm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ rustc_session = { path = "../librustc_session" }
3333
rustc_serialize = { path = "../libserialize", package = "serialize" }
3434
rustc_target = { path = "../librustc_target" }
3535
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
36-
syntax = { path = "../libsyntax" }
36+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
3737
rustc_span = { path = "../librustc_span" }

‎src/librustc_codegen_ssa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobserver = "0.1.11"
2020
tempfile = "3.1"
2121

2222
rustc_serialize = { path = "../libserialize", package = "serialize" }
23-
syntax = { path = "../libsyntax" }
23+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2424
rustc_span = { path = "../librustc_span" }
2525
rustc = { path = "../librustc" }
2626
rustc_apfloat = { path = "../librustc_apfloat" }

‎src/librustc_codegen_utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log = "0.4"
1414
punycode = "0.4.0"
1515
rustc-demangle = "0.1.16"
1616

17-
syntax = { path = "../libsyntax" }
17+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
1818
rustc_span = { path = "../librustc_span" }
1919
rustc = { path = "../librustc" }
2020
rustc_hir = { path = "../librustc_hir" }

‎src/librustc_driver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
3131
rustc_error_codes = { path = "../librustc_error_codes" }
3232
rustc_interface = { path = "../librustc_interface" }
3333
rustc_serialize = { path = "../libserialize", package = "serialize" }
34-
syntax = { path = "../libsyntax" }
34+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
3535
rustc_span = { path = "../librustc_span" }
3636

3737
[target.'cfg(windows)'.dependencies]

‎src/librustc_expand/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ rustc_lexer = { path = "../librustc_lexer" }
2424
rustc_parse = { path = "../librustc_parse" }
2525
rustc_session = { path = "../librustc_session" }
2626
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
27-
syntax = { path = "../libsyntax" }
27+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_hir/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ rustc_index = { path = "../librustc_index" }
1818
rustc_span = { path = "../librustc_span" }
1919
rustc_errors = { path = "../librustc_errors" }
2020
rustc_serialize = { path = "../libserialize", package = "serialize" }
21-
syntax = { path = "../libsyntax" }
21+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2222
lazy_static = "1"
2323
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_incremental/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rustc = { path = "../librustc" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_hir = { path = "../librustc_hir" }
1919
rustc_serialize = { path = "../libserialize", package = "serialize" }
20-
syntax = { path = "../libsyntax" }
20+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2121
rustc_span = { path = "../librustc_span" }
2222
rustc_fs_util = { path = "../librustc_fs_util" }
2323
rustc_session = { path = "../librustc_session" }

‎src/librustc_infer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ rustc_session = { path = "../librustc_session" }
2525
rustc_span = { path = "../librustc_span" }
2626
rustc_target = { path = "../librustc_target" }
2727
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
28-
syntax = { path = "../libsyntax" }
28+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_interface/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ doctest = false
1313
log = "0.4"
1414
rayon = { version = "0.3.0", package = "rustc-rayon" }
1515
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
16-
syntax = { path = "../libsyntax" }
16+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
1717
rustc_attr = { path = "../librustc_attr" }
1818
rustc_builtin_macros = { path = "../librustc_builtin_macros" }
1919
rustc_expand = { path = "../librustc_expand" }

‎src/librustc_interface/callbacks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc::ty::tls;
1313
use rustc_errors::{Diagnostic, TRACK_DIAGNOSTICS};
1414
use std::fmt;
1515

16-
/// This is a callback from libsyntax as it cannot access the implicit state
16+
/// This is a callback from librustc_ast as it cannot access the implicit state
1717
/// in librustc otherwise.
1818
fn span_debug(span: rustc_span::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1919
tls::with_opt(|tcx| {
@@ -25,7 +25,7 @@ fn span_debug(span: rustc_span::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result
2525
})
2626
}
2727

28-
/// This is a callback from libsyntax as it cannot access the implicit state
28+
/// This is a callback from librustc_ast as it cannot access the implicit state
2929
/// in librustc otherwise. It is used to when diagnostic messages are
3030
/// emitted and stores them in the current query, if there is one.
3131
fn track_diagnostic(diagnostic: &Diagnostic) {

‎src/librustc_interface/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ pub fn spawn_thread_pool<F: FnOnce() -> R + Send, R: Send>(
189189
// The main handler runs for each Rayon worker thread and sets up
190190
// the thread local rustc uses. syntax_globals and rustc_span_globals are
191191
// captured and set on the new threads. ty::tls::with_thread_locals sets up
192-
// thread local callbacks from libsyntax
192+
// thread local callbacks from librustc_ast
193193
let main_handler = move |thread: ThreadBuilder| {
194194
syntax::GLOBALS.set(syntax_globals, || {
195195
rustc_span::GLOBALS.set(rustc_span_globals, || {

‎src/librustc_lint/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rustc_attr = { path = "../librustc_attr" }
1717
rustc_errors = { path = "../librustc_errors" }
1818
rustc_hir = { path = "../librustc_hir" }
1919
rustc_target = { path = "../librustc_target" }
20-
syntax = { path = "../libsyntax" }
20+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2121
rustc_span = { path = "../librustc_span" }
2222
rustc_data_structures = { path = "../librustc_data_structures" }
2323
rustc_feature = { path = "../librustc_feature" }

‎src/librustc_lint/early.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
251251

252252
fn visit_mac(&mut self, mac: &'a ast::Mac) {
253253
// FIXME(#54110): So, this setup isn't really right. I think
254-
// that (a) the libsyntax visitor ought to be doing this as
254+
// that (a) the librustc_ast visitor ought to be doing this as
255255
// part of `walk_mac`, and (b) we should be calling
256256
// `visit_path`, *but* that would require a `NodeId`, and I
257257
// want to get #53686 fixed quickly. -nmatsakis

‎src/librustc_metadata/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ rustc_target = { path = "../librustc_target" }
2424
rustc_index = { path = "../librustc_index" }
2525
rustc_serialize = { path = "../libserialize", package = "serialize" }
2626
stable_deref_trait = "1.0.0"
27-
syntax = { path = "../libsyntax" }
27+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2828
rustc_expand = { path = "../librustc_expand" }
2929
rustc_parse = { path = "../librustc_parse" }
3030
rustc_span = { path = "../librustc_span" }

‎src/librustc_metadata/rmeta/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@ impl<'a, 'tcx> CrateMetadata {
16161616
}
16171617

16181618
// Cannot be implemented on 'ProcMacro', as libproc_macro
1619-
// does not depend on libsyntax
1619+
// does not depend on librustc_ast
16201620
fn macro_kind(raw: &ProcMacro) -> MacroKind {
16211621
match raw {
16221622
ProcMacro::CustomDerive { .. } => MacroKind::Derive,

‎src/librustc_mir/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ rustc_lexer = { path = "../librustc_lexer" }
2828
rustc_macros = { path = "../librustc_macros" }
2929
rustc_serialize = { path = "../libserialize", package = "serialize" }
3030
rustc_target = { path = "../librustc_target" }
31-
syntax = { path = "../libsyntax" }
31+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
3232
rustc_span = { path = "../librustc_span" }
3333
rustc_apfloat = { path = "../librustc_apfloat" }
3434
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_mir_build/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
2525
rustc_session = { path = "../librustc_session" }
2626
rustc_span = { path = "../librustc_span" }
2727
rustc_target = { path = "../librustc_target" }
28-
syntax = { path = "../libsyntax" }
28+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2929
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_parse/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ rustc_errors = { path = "../librustc_errors" }
2121
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
2222
rustc_session = { path = "../librustc_session" }
2323
rustc_span = { path = "../librustc_span" }
24-
syntax = { path = "../libsyntax" }
24+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2525
unicode-normalization = "0.1.11"

‎src/librustc_parse/lexer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl<'a> StringReader<'a> {
172172
}
173173

174174
/// Turns simple `rustc_lexer::TokenKind` enum into a rich
175-
/// `libsyntax::TokenKind`. This turns strings into interned
175+
/// `librustc_ast::TokenKind`. This turns strings into interned
176176
/// symbols and runs additional validation.
177177
fn cook_lexer_token(&self, token: rustc_lexer::TokenKind, start: BytePos) -> TokenKind {
178178
match token {

‎src/librustc_parse/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ pub fn stream_to_parser<'a>(
269269
/// # Note
270270
///
271271
/// The main usage of this function is outside of rustc, for those who uses
272-
/// libsyntax as a library. Please do not remove this function while refactoring
272+
/// librustc_ast as a library. Please do not remove this function while refactoring
273273
/// just because it is not used in rustc codebase!
274274
pub fn stream_to_parser_with_base_dir<'a>(
275275
sess: &'a ParseSess,

‎src/librustc_passes/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ rustc_index = { path = "../librustc_index" }
2020
rustc_infer = { path = "../librustc_infer" }
2121
rustc_session = { path = "../librustc_session" }
2222
rustc_target = { path = "../librustc_target" }
23-
syntax = { path = "../libsyntax" }
23+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2424
rustc_span = { path = "../librustc_span" }

‎src/librustc_passes/entry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ fn entry_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<(DefId, EntryFnType)> {
7777
configure_main(tcx, &ctxt)
7878
}
7979

80-
// Beware, this is duplicated in `libsyntax/entry.rs`, so make sure to keep
80+
// Beware, this is duplicated in `librustc_ast/entry.rs`, so make sure to keep
8181
// them in sync.
8282
fn entry_point_type(item: &Item<'_>, at_root: bool) -> EntryPointType {
8383
match item.kind {

‎src/librustc_plugin_impl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ rustc_errors = { path = "../librustc_errors" }
1616
rustc_hir = { path = "../librustc_hir" }
1717
rustc_lint = { path = "../librustc_lint" }
1818
rustc_metadata = { path = "../librustc_metadata" }
19-
syntax = { path = "../libsyntax" }
19+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2020
rustc_span = { path = "../librustc_span" }

‎src/librustc_privacy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ rustc_attr = { path = "../librustc_attr" }
1414
rustc_errors = { path = "../librustc_errors" }
1515
rustc_hir = { path = "../librustc_hir" }
1616
rustc_typeck = { path = "../librustc_typeck" }
17-
syntax = { path = "../libsyntax" }
17+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
1818
rustc_span = { path = "../librustc_span" }
1919
rustc_data_structures = { path = "../librustc_data_structures" }
2020
log = "0.4"

‎src/librustc_resolve/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ doctest = false
1313
[dependencies]
1414
bitflags = "1.2.1"
1515
log = "0.4"
16-
syntax = { path = "../libsyntax" }
16+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
1717
arena = { path = "../libarena" }
1818
rustc = { path = "../librustc" }
1919
rustc_ast_lowering = { path = "../librustc_ast_lowering" }

‎src/librustc_save_analysis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
1717
rustc_hir = { path = "../librustc_hir" }
1818
rustc_parse = { path = "../librustc_parse" }
1919
serde_json = "1"
20-
syntax = { path = "../libsyntax" }
20+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2121
rustc_span = { path = "../librustc_span" }
2222
rls-data = "0.19"
2323
rls-span = "0.5"

‎src/librustc_session/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ rustc_span = { path = "../librustc_span" }
1919
rustc_index = { path = "../librustc_index" }
2020
rustc_fs_util = { path = "../librustc_fs_util" }
2121
num_cpus = "1.0"
22-
syntax = { path = "../libsyntax" }
22+
syntax = { path = "../librustc_ast", package = "rustc_ast" }

‎src/librustc_span/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub enum FileName {
8989
QuoteExpansion(u64),
9090
/// Command line.
9191
Anon(u64),
92-
/// Hack in `src/libsyntax/parse.rs`.
92+
/// Hack in `src/librustc_ast/parse.rs`.
9393
// FIXME(jseyfried)
9494
MacroExpansion(u64),
9595
ProcMacroSourceCode(u64),

‎src/librustc_traits/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1515
rustc_hir = { path = "../librustc_hir" }
1616
rustc_macros = { path = "../librustc_macros" }
1717
rustc_target = { path = "../librustc_target" }
18-
syntax = { path = "../libsyntax" }
18+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
1919
rustc_span = { path = "../librustc_span" }
2020
chalk-engine = { version = "0.9.0", default-features=false }
2121
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_typeck/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ rustc_errors = { path = "../librustc_errors" }
2020
rustc_hir = { path = "../librustc_hir" }
2121
rustc_target = { path = "../librustc_target" }
2222
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
23-
syntax = { path = "../libsyntax" }
23+
syntax = { path = "../librustc_ast", package = "rustc_ast" }
2424
rustc_span = { path = "../librustc_span" }
2525
rustc_index = { path = "../librustc_index" }
2626
rustc_infer = { path = "../librustc_infer" }

‎src/librustdoc/clean/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn krate(mut cx: &mut DocContext<'_>) -> Crate {
3838
}
3939
externs.sort_by(|&(a, _), &(b, _)| a.cmp(&b));
4040

41-
// Clean the crate, translating the entire libsyntax AST to one that is
41+
// Clean the crate, translating the entire librustc_ast AST to one that is
4242
// understood by rustdoc.
4343
let mut module = module.clean(cx);
4444
let mut masked_crates = FxHashSet::default();

‎src/librustdoc/html/highlight.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Basic syntax highlighting functionality.
22
//!
3-
//! This module uses libsyntax's lexer to provide token-based highlighting for
3+
//! This module uses librustc_ast's lexer to provide token-based highlighting for
44
//! the HTML documentation generated by rustdoc.
55
//!
66
//! Use the `render_with_highlighting` to highlight some rust code.

‎src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
extern crate env_logger;
1818
extern crate getopts;
1919
extern crate rustc;
20+
extern crate rustc_ast as syntax;
2021
extern crate rustc_ast_pretty;
2122
extern crate rustc_attr;
2223
extern crate rustc_data_structures;
@@ -38,7 +39,6 @@ extern crate rustc_session;
3839
extern crate rustc_span as rustc_span;
3940
extern crate rustc_target;
4041
extern crate rustc_typeck;
41-
extern crate syntax;
4242
extern crate test as testing;
4343
#[macro_use]
4444
extern crate log;

0 commit comments

Comments
 (0)