Make it build again

petrochenkov · petrochenkov · commit 6054a3037020 · 2020-02-29T20:47:10.000+03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
@@ -996,7 +996,7 @@ impl Step for Src {
             "src/tools/rustc-std-workspace-alloc",
             "src/tools/rustc-std-workspace-std",
             "src/librustc",
-            "src/libsyntax",
+            "src/librustc_ast",
         ];
 
         copy_src_dirs(builder, &std_src_dirs[..], &[], &dst_src);
diff --git a/src/doc/rustc-ux-guidelines.md b/src/doc/rustc-ux-guidelines.md
@@ -62,7 +62,7 @@ for details on how to format and write long error codes.
 * All of them are accessible [online](http://doc.rust-lang.org/error-index.html),
   which are auto-generated from rustc source code in different places:
   [librustc](https://github.com/rust-lang/rust/blob/master/src/librustc/error_codes.rs),
-  [libsyntax](https://github.com/rust-lang/rust/blob/master/src/libsyntax/error_codes.rs),
+  [librustc_ast](https://github.com/rust-lang/rust/blob/master/src/librustc_ast/error_codes.rs),
   [librustc_borrowck](https://github.com/rust-lang/rust/blob/master/src/librustc_borrowck/error_codes.rs),
   [librustc_metadata](https://github.com/rust-lang/rust/blob/master/src/librustc_metadata/error_codes.rs),
   [librustc_mir](https://github.com/rust-lang/rust/blob/master/src/librustc_mir/error_codes.rs),
diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md
@@ -23,7 +23,7 @@ mechanics of defining and loading a plugin.
 
 In the vast majority of cases, a plugin should *only* be used through
 `#![plugin]` and not through an `extern crate` item.  Linking a plugin would
-pull in all of libsyntax and librustc as dependencies of your crate.  This is
+pull in all of librustc_ast and librustc as dependencies of your crate.  This is
 generally unwanted unless you are building another plugin.
 
 The usual practice is to put compiler plugins in their own crate, separate from
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
@@ -28,7 +28,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_index = { path = "../librustc_index" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 backtrace = "0.3.40"
 parking_lot = "0.9"
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
@@ -1,5 +1,5 @@
 //! This module contains `HashStable` implementations for various data types
-//! from libsyntax in no particular order.
+//! from librustc_ast in no particular order.
 
 use crate::ich::StableHashingContext;
 
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
@@ -1720,7 +1720,7 @@ pub mod tls {
         set_tlv(context as *const _ as usize, || f(&context))
     }
 
-    /// Enters `GlobalCtxt` by setting up libsyntax callbacks and
+    /// Enters `GlobalCtxt` by setting up librustc_ast callbacks and
     /// creating a initial `TyCtxt` and `ImplicitCtxt`.
     /// This happens once per rustc session and `TyCtxt`s only exists
     /// inside the `f` function.
diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs
@@ -118,7 +118,7 @@ impl BoundRegion {
 }
 
 /// N.B., if you change this, you'll probably want to change the corresponding
-/// AST structure in `libsyntax/ast.rs` as well.
+/// AST structure in `librustc_ast/ast.rs` as well.
 #[derive(
     Clone,
     PartialEq,
diff --git a/src/librustc_ast/Cargo.toml b/src/librustc_ast/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "syntax"
+name = "rustc_ast"
 version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "syntax"
+name = "rustc_ast"
 path = "lib.rs"
 doctest = false
 
diff --git a/src/librustc_ast_lowering/Cargo.toml b/src/librustc_ast_lowering/Cargo.toml
@@ -20,5 +20,5 @@ rustc_index = { path = "../librustc_index" }
 rustc_span = { path = "../librustc_span" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_session = { path = "../librustc_session" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_ast_passes/Cargo.toml b/src/librustc_ast_passes/Cargo.toml
@@ -18,4 +18,4 @@ rustc_feature = { path = "../librustc_feature" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_ast_pretty/Cargo.toml b/src/librustc_ast_pretty/Cargo.toml
@@ -13,4 +13,4 @@ doctest = false
 log = "0.4"
 rustc_span = { path = "../librustc_span" }
 rustc_data_structures = { path = "../librustc_data_structures" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_attr/Cargo.toml b/src/librustc_attr/Cargo.toml
@@ -19,4 +19,4 @@ rustc_feature = { path = "../librustc_feature" }
 rustc_macros = { path = "../librustc_macros" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 rustc_session = { path = "../librustc_session" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_builtin_macros/Cargo.toml b/src/librustc_builtin_macros/Cargo.toml
@@ -21,6 +21,6 @@ rustc_parse = { path = "../librustc_parse" }
 rustc_target = { path = "../librustc_target" }
 rustc_session = { path = "../librustc_session" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml
@@ -33,5 +33,5 @@ rustc_session = { path = "../librustc_session" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_target = { path = "../librustc_target" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml
@@ -20,7 +20,7 @@ jobserver = "0.1.11"
 tempfile = "3.1"
 
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc = { path = "../librustc" }
 rustc_apfloat = { path = "../librustc_apfloat" }
diff --git a/src/librustc_codegen_utils/Cargo.toml b/src/librustc_codegen_utils/Cargo.toml
@@ -14,7 +14,7 @@ log = "0.4"
 punycode = "0.4.0"
 rustc-demangle = "0.1.16"
 
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc = { path = "../librustc" }
 rustc_hir = { path = "../librustc_hir" }
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
@@ -31,7 +31,7 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_error_codes = { path = "../librustc_error_codes" }
 rustc_interface = { path = "../librustc_interface" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 
 [target.'cfg(windows)'.dependencies]
diff --git a/src/librustc_expand/Cargo.toml b/src/librustc_expand/Cargo.toml
@@ -24,4 +24,4 @@ rustc_lexer = { path = "../librustc_lexer" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_session = { path = "../librustc_session" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_hir/Cargo.toml b/src/librustc_hir/Cargo.toml
@@ -18,6 +18,6 @@ rustc_index = { path = "../librustc_index" }
 rustc_span = { path = "../librustc_span" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 lazy_static = "1"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
@@ -17,7 +17,7 @@ rustc = { path = "../librustc" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_infer/Cargo.toml b/src/librustc_infer/Cargo.toml
@@ -25,4 +25,4 @@ rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
 rustc_target = { path = "../librustc_target" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 log = "0.4"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_attr = { path = "../librustc_attr" }
 rustc_builtin_macros = { path = "../librustc_builtin_macros" }
 rustc_expand = { path = "../librustc_expand" }
diff --git a/src/librustc_interface/callbacks.rs b/src/librustc_interface/callbacks.rs
@@ -13,7 +13,7 @@ use rustc::ty::tls;
 use rustc_errors::{Diagnostic, TRACK_DIAGNOSTICS};
 use std::fmt;
 
-/// This is a callback from libsyntax as it cannot access the implicit state
+/// This is a callback from librustc_ast as it cannot access the implicit state
 /// in librustc otherwise.
 fn span_debug(span: rustc_span::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     tls::with_opt(|tcx| {
@@ -25,7 +25,7 @@ fn span_debug(span: rustc_span::Span, f: &mut fmt::Formatter<'_>) -> fmt::Result
     })
 }
 
-/// This is a callback from libsyntax as it cannot access the implicit state
+/// This is a callback from librustc_ast as it cannot access the implicit state
 /// in librustc otherwise. It is used to when diagnostic messages are
 /// emitted and stores them in the current query, if there is one.
 fn track_diagnostic(diagnostic: &Diagnostic) {
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
@@ -189,7 +189,7 @@ pub fn spawn_thread_pool<F: FnOnce() -> R + Send, R: Send>(
                 // The main handler runs for each Rayon worker thread and sets up
                 // the thread local rustc uses. syntax_globals and rustc_span_globals are
                 // captured and set on the new threads. ty::tls::with_thread_locals sets up
-                // thread local callbacks from libsyntax
+                // thread local callbacks from librustc_ast
                 let main_handler = move |thread: ThreadBuilder| {
                     syntax::GLOBALS.set(syntax_globals, || {
                         rustc_span::GLOBALS.set(rustc_span_globals, || {
diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml
@@ -17,7 +17,7 @@ rustc_attr = { path = "../librustc_attr" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_feature = { path = "../librustc_feature" }
diff --git a/src/librustc_lint/early.rs b/src/librustc_lint/early.rs
@@ -251,7 +251,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
 
     fn visit_mac(&mut self, mac: &'a ast::Mac) {
         // FIXME(#54110): So, this setup isn't really right. I think
-        // that (a) the libsyntax visitor ought to be doing this as
+        // that (a) the librustc_ast visitor ought to be doing this as
         // part of `walk_mac`, and (b) we should be calling
         // `visit_path`, *but* that would require a `NodeId`, and I
         // want to get #53686 fixed quickly. -nmatsakis
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
@@ -24,7 +24,7 @@ rustc_target = { path = "../librustc_target" }
 rustc_index = { path = "../librustc_index" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 stable_deref_trait = "1.0.0"
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_metadata/rmeta/decoder.rs b/src/librustc_metadata/rmeta/decoder.rs
@@ -1616,7 +1616,7 @@ impl<'a, 'tcx> CrateMetadata {
 }
 
 // Cannot be implemented on 'ProcMacro', as libproc_macro
-// does not depend on libsyntax
+// does not depend on librustc_ast
 fn macro_kind(raw: &ProcMacro) -> MacroKind {
     match raw {
         ProcMacro::CustomDerive { .. } => MacroKind::Derive,
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
@@ -28,7 +28,7 @@ rustc_lexer = { path = "../librustc_lexer" }
 rustc_macros = { path = "../librustc_macros" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_apfloat = { path = "../librustc_apfloat" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_mir_build/Cargo.toml b/src/librustc_mir_build/Cargo.toml
@@ -25,5 +25,5 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_parse/Cargo.toml b/src/librustc_parse/Cargo.toml
@@ -21,5 +21,5 @@ rustc_errors = { path = "../librustc_errors" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 unicode-normalization = "0.1.11"
diff --git a/src/librustc_parse/lexer/mod.rs b/src/librustc_parse/lexer/mod.rs
@@ -172,7 +172,7 @@ impl<'a> StringReader<'a> {
     }
 
     /// Turns simple `rustc_lexer::TokenKind` enum into a rich
-    /// `libsyntax::TokenKind`. This turns strings into interned
+    /// `librustc_ast::TokenKind`. This turns strings into interned
     /// symbols and runs additional validation.
     fn cook_lexer_token(&self, token: rustc_lexer::TokenKind, start: BytePos) -> TokenKind {
         match token {
diff --git a/src/librustc_parse/lib.rs b/src/librustc_parse/lib.rs
@@ -269,7 +269,7 @@ pub fn stream_to_parser<'a>(
 /// # Note
 ///
 /// The main usage of this function is outside of rustc, for those who uses
-/// libsyntax as a library. Please do not remove this function while refactoring
+/// librustc_ast as a library. Please do not remove this function while refactoring
 /// just because it is not used in rustc codebase!
 pub fn stream_to_parser_with_base_dir<'a>(
     sess: &'a ParseSess,
diff --git a/src/librustc_passes/Cargo.toml b/src/librustc_passes/Cargo.toml
@@ -20,5 +20,5 @@ rustc_index = { path = "../librustc_index" }
 rustc_infer = { path = "../librustc_infer" }
 rustc_session = { path = "../librustc_session" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_passes/entry.rs b/src/librustc_passes/entry.rs
@@ -77,7 +77,7 @@ fn entry_fn(tcx: TyCtxt<'_>, cnum: CrateNum) -> Option<(DefId, EntryFnType)> {
     configure_main(tcx, &ctxt)
 }
 
-// Beware, this is duplicated in `libsyntax/entry.rs`, so make sure to keep
+// Beware, this is duplicated in `librustc_ast/entry.rs`, so make sure to keep
 // them in sync.
 fn entry_point_type(item: &Item<'_>, at_root: bool) -> EntryPointType {
     match item.kind {
diff --git a/src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin_impl/Cargo.toml
@@ -16,5 +16,5 @@ rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_lint = { path = "../librustc_lint" }
 rustc_metadata = { path = "../librustc_metadata" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_privacy/Cargo.toml b/src/librustc_privacy/Cargo.toml
@@ -14,7 +14,7 @@ rustc_attr = { path = "../librustc_attr" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_typeck = { path = "../librustc_typeck" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 log = "0.4"
diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 bitflags = "1.2.1"
 log = "0.4"
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 arena = { path = "../libarena" }
 rustc = { path = "../librustc" }
 rustc_ast_lowering = { path = "../librustc_ast_lowering" }
diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml
@@ -17,7 +17,7 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_parse = { path = "../librustc_parse" }
 serde_json = "1"
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rls-data = "0.19"
 rls-span = "0.5"
diff --git a/src/librustc_session/Cargo.toml b/src/librustc_session/Cargo.toml
@@ -19,4 +19,4 @@ rustc_span = { path = "../librustc_span" }
 rustc_index = { path = "../librustc_index" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 num_cpus = "1.0"
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
diff --git a/src/librustc_span/lib.rs b/src/librustc_span/lib.rs
@@ -89,7 +89,7 @@ pub enum FileName {
     QuoteExpansion(u64),
     /// Command line.
     Anon(u64),
-    /// Hack in `src/libsyntax/parse.rs`.
+    /// Hack in `src/librustc_ast/parse.rs`.
     // FIXME(jseyfried)
     MacroExpansion(u64),
     ProcMacroSourceCode(u64),
diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml
@@ -15,7 +15,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_macros = { path = "../librustc_macros" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 chalk-engine = { version = "0.9.0", default-features=false }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
@@ -20,7 +20,7 @@ rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+syntax = { path = "../librustc_ast", package = "rustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_index = { path = "../librustc_index" }
 rustc_infer = { path = "../librustc_infer" }
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs
@@ -38,7 +38,7 @@ pub fn krate(mut cx: &mut DocContext<'_>) -> Crate {
     }
     externs.sort_by(|&(a, _), &(b, _)| a.cmp(&b));
 
-    // Clean the crate, translating the entire libsyntax AST to one that is
+    // Clean the crate, translating the entire librustc_ast AST to one that is
     // understood by rustdoc.
     let mut module = module.clean(cx);
     let mut masked_crates = FxHashSet::default();
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
@@ -1,6 +1,6 @@
 //! Basic syntax highlighting functionality.
 //!
-//! This module uses libsyntax's lexer to provide token-based highlighting for
+//! This module uses librustc_ast's lexer to provide token-based highlighting for
 //! the HTML documentation generated by rustdoc.
 //!
 //! Use the `render_with_highlighting` to highlight some rust code.
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
@@ -17,6 +17,7 @@
 extern crate env_logger;
 extern crate getopts;
 extern crate rustc;
+extern crate rustc_ast as syntax;
 extern crate rustc_ast_pretty;
 extern crate rustc_attr;
 extern crate rustc_data_structures;
@@ -38,7 +39,6 @@ extern crate rustc_session;
 extern crate rustc_span as rustc_span;
 extern crate rustc_target;
 extern crate rustc_typeck;
-extern crate syntax;
 extern crate test as testing;
 #[macro_use]
 extern crate log;
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
diff --git a/src/libtest/cli.rs b/src/libtest/cli.rs
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
diff --git a/src/test/rustdoc/comment-in-doctest.rs b/src/test/rustdoc/comment-in-doctest.rs
diff --git a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
diff --git a/src/test/ui-fulldeps/plugin-as-extern-crate.rs b/src/test/ui-fulldeps/plugin-as-extern-crate.rs
diff --git a/src/test/ui/issues/issue-22777.rs b/src/test/ui/issues/issue-22777.rs
diff --git a/src/test/ui/regions/regions-trait-object-1.rs b/src/test/ui/regions/regions-trait-object-1.rs
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs

Original file line number	Diff line number	Diff line change
`@@ -1720,7 +1720,7 @@ pub mod tls {`
`1720`	`1720`	`set_tlv(context as *const _ as usize, \|\| f(&context))`
`1721`	`1721`	`}`
`1722`	`1722`
`1723`		- /// Enters `GlobalCtxt` by setting up libsyntax callbacks and
	`1723`	+ /// Enters `GlobalCtxt` by setting up librustc_ast callbacks and
`1724`	`1724`	/// creating a initial `TyCtxt` and `ImplicitCtxt`.
`1725`	`1725`	/// This happens once per rustc session and `TyCtxt`s only exists
`1726`	`1726`	/// inside the `f` function.
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ impl BoundRegion {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/// 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.
`122`	`122`	`#[derive(`
`123`	`123`	`Clone,`
`124`	`124`	`PartialEq,`