Fix links and CI error.

4 files changed, 10 insertions, 9 deletions

diff --git a/src/doc/rustc-dev-guide/src/appendix/code-index.md b/src/doc/rustc-dev-guide/src/appendix/code-index.md
index a4b18ecc071..327709c3188 100644
--- a/src/doc/rustc-dev-guide/src/appendix/code-index.md
+++ b/src/doc/rustc-dev-guide/src/appendix/code-index.md
@@ -27,7 +27,7 @@ Item            |  Kind    | Short description           | Chapter            |
 `StringReader` | struct | This is the lexer used during parsing. It consumes characters from the raw source code being compiled and produces a series of tokens for use by the rest of the parser | [The parser] |  [src/librustc_parse/lexer/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/lexer/struct.StringReader.html)
 `rustc_ast::token_stream::TokenStream` | struct | An abstract sequence of tokens, organized into `TokenTree`s | [The parser], [Macro expansion] | [src/librustc_ast/tokenstream.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/tokenstream/struct.TokenStream.html)
 `TraitDef` | struct | This struct contains a trait's definition with type information | [The `ty` modules] |  [src/librustc_middle/ty/trait_def.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/trait_def/struct.TraitDef.html)
-`TraitRef` | struct | The combination of a trait and its input types (e.g. `P0: Trait<P1...Pn>`) | [Trait Solving: Goals and Clauses], [Trait Solving: Lowering impls]  |  [src/librustc_middle/ty/sty.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TraitRef.html)
+`TraitRef` | struct | The combination of a trait and its input types (e.g. `P0: Trait<P1...Pn>`) | [Chalk Book: Goals and Clauses], [Chalk Book: Lowering impls]  |  [src/librustc_middle/ty/sty.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TraitRef.html)
 `Ty<'tcx>` | struct | This is the internal representation of a type used for type checking | [Type checking] | [src/librustc_middle/ty/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/type.Ty.html)
 `TyCtxt<'tcx>` | struct | The "typing context". This is the central data structure in the compiler. It is the context that you use to perform all manner of queries | [The `ty` modules] | [src/librustc_middle/ty/context.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/struct.TyCtxt.html)
 
@@ -42,5 +42,5 @@ Item            |  Kind    | Short description           | Chapter            |
 [Macro expansion]: ../macro-expansion.html
 [Name resolution]: ../name-resolution.html
 [Parameter Environment]: ../param_env.html
-[Trait Solving: Goals and Clauses]: ../traits/goals-and-clauses.html#domain-goals
-[Trait Solving: Lowering impls]: ../traits/lowering-rules.html#lowering-impls
+[Chalk Book: Goals and Clauses]: https://rust-lang.github.io/chalk/book/clauses/goals_and_clauses.html#domain-goals
+[Chalk Book: Lowering impls]: https://rust-lang.github.io/chalk/book/clauses/lowering_rules.html#lowering-impls
diff --git a/src/doc/rustc-dev-guide/src/appendix/glossary.md b/src/doc/rustc-dev-guide/src/appendix/glossary.md
index 5dc8f3801b3..ded31485b2a 100644
--- a/src/doc/rustc-dev-guide/src/appendix/glossary.md
+++ b/src/doc/rustc-dev-guide/src/appendix/glossary.md
@@ -49,7 +49,7 @@ memoization <div id="memoization"/>      |  The process of storing the results o
 MIR <div id="mir"/>                      |  The Mid-level IR that is created after type-checking for use by borrowck and codegen. ([see more](../mir/index.html))
 miri <div id="miri"/>                    |  An interpreter for MIR used for constant evaluation. ([see more](../miri.html))
 monomorphization <div id="mono"/>        |  The process of taking generic implementations of types and functions and instantiating them with concrete types. For example, in the code we might have `Vec<T>`, but in the final executable, we will have a copy of the `Vec` code for every concrete type used in the program (e.g. a copy for `Vec<usize>`, a copy for `Vec<MyStruct>`, etc).
-normalize <div id="normalize"/>          |  A general term for converting to a more canonical form, but in the case of rustc typically refers to [associated type normalization](../traits/associated-types.html#normalize).
+normalize <div id="normalize"/>          |  A general term for converting to a more canonical form, but in the case of rustc typically refers to [associated type normalization](https://rust-lang.github.io/chalk/book/clauses/type_equality.html#normalize).
 newtype <div id="newtype"/>              |  A wrapper around some other type (e.g., `struct Foo(T)` is a "newtype" for `T`). This is commonly used in Rust to give a stronger type for indices.
 NLL <div id="nll"/>                      |  Short for [non-lexical lifetimes](../borrow_check/region_inference.html), this is an extension to Rust's borrowing system to make it be based on the control-flow graph.
 node-id or NodeId <div id="node-id"/>    |  An index identifying a particular node in the AST or HIR; gradually being phased out and replaced with `HirId`. See [the HIR chapter for more](../hir.html#identifiers-in-the-hir).
@@ -57,7 +57,7 @@ obligation <div id="obligation"/>        |  Something that must be proven by the
 placeholder <div id="placeholder"/>      |  **NOTE: skolemization is deprecated by placeholder** a way of handling subtyping around "for-all" types (e.g., `for<'a> fn(&'a u32)`) as well as solving higher-ranked trait bounds (e.g., `for<'a> T: Trait<'a>`). See [the chapter on placeholder and universes](../borrow_check/region_inference/placeholders_and_universes.md) for more details.
 point <div id="point"/>                  |  Used in the NLL analysis to refer to some particular location in the MIR; typically used to refer to a node in the control-flow graph.
 polymorphize <div id="polymorphize"/>    |  An optimization that avoids unnecessary monomorphisation. ([see more](../backend/monomorph.md#polymorphization))
-projection <div id="projection"/>        |  A general term for a "relative path", e.g. `x.f` is a "field projection", and `T::Item` is an ["associated type projection"](../traits/goals-and-clauses.html#trait-ref).
+projection <div id="projection"/>        |  A general term for a "relative path", e.g. `x.f` is a "field projection", and `T::Item` is an ["associated type projection"](https://rust-lang.github.io/chalk/book/clauses/goals_and_clauses.html#trait-ref).
 promoted constants <div id="pc"/>        |  Constants extracted from a function and lifted to static scope; see [this section](../mir/index.html#promoted) for more details.
 provider <div id="provider"/>            |  The function that executes a query. ([see more](../query.html))
 quantified <div id="quantified"/>        |  In math or logic, existential and universal quantification are used to ask questions like "is there any type T for which is true?" or "is this true for all types T?"; see [the background chapter for more](./background.html#quantified).
@@ -74,7 +74,7 @@ tcx <div id="tcx"/>                      |  The "typing context", main data stru
 'tcx <div id="lifetime-tcx"/>            |  The lifetime of the allocation arena. ([see more](../ty.html))
 token <div id="token"/>                  |  The smallest unit of parsing. Tokens are produced after lexing ([see more](../the-parser.html)).
 [TLS] <div id="tls"/>                    |  Thread-Local Storage. Variables may be defined so that each thread has its own copy (rather than all threads sharing the variable). This has some interactions with LLVM. Not all platforms support TLS.
-trait reference <div id="trait-ref"/>    |  The name of a trait along with a suitable set of input type/lifetimes. ([see more](../traits/goals-and-clauses.html#trait-ref))
+trait reference <div id="trait-ref"/>    |  The name of a trait along with a suitable set of input type/lifetimes. ([see more](https://rust-lang.github.io/chalk/book/clauses/goals_and_clauses.html#trait-ref))
 trans <div id="trans"/>                  |  The code to translate MIR into LLVM IR. Renamed to codegen.
 ty <div id="ty"/>                        |  The internal representation of a type. ([see more](../ty.html))
 UFCS <div id="ufcs"/>                    |  Short for Universal Function Call Syntax, this is an unambiguous syntax for calling a method. ([see more](../type-checking.html))
diff --git a/src/doc/rustc-dev-guide/src/traits/chalk.md b/src/doc/rustc-dev-guide/src/traits/chalk.md
index dcb0a244f0e..dceb043541c 100644
--- a/src/doc/rustc-dev-guide/src/traits/chalk.md
+++ b/src/doc/rustc-dev-guide/src/traits/chalk.md
@@ -37,7 +37,8 @@ and designs for the trait system.
 
 **rustc**. Once we are happy with the logical rules, we proceed to
 implementing them in rustc. This mainly happens in
-[`librustc_traits`][librustc_traits]. We map our struct, trait, and impl declarations into logical inference rules in the [lowering module in rustc](./lowering-module.md).
+[`librustc_traits`][librustc_traits]. We map our struct, trait, and impl declarations
+into logical inference rules in the [lowering module in rustc](./lowering-module.md).
 
 [chalk]: https://github.com/rust-lang/chalk
 [librustc_traits]: https://github.com/rust-lang/rust/tree/master/src/librustc_traits
diff --git a/src/doc/rustc-dev-guide/src/traits/lowering-module.md b/src/doc/rustc-dev-guide/src/traits/lowering-module.md
index 3c5bd7be5d5..0efc82c3e8b 100644
--- a/src/doc/rustc-dev-guide/src/traits/lowering-module.md
+++ b/src/doc/rustc-dev-guide/src/traits/lowering-module.md
@@ -1,8 +1,8 @@
 # The lowering module in rustc
 
 The program clauses described in the
-[lowering rules](./lowering-rules.html) section are actually
-created in the [`rustc_traits::lowering`][lowering] module.
+[lowering rules chapter in Chalk Book](https://rust-lang.github.io/chalk/book/clauses/lowering_rules.html)
+are actually created in the [`rustc_traits::lowering`][lowering] module.
 
 [lowering]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_traits/lowering/