Remove details about chalk and point to Chalk Book instead.

src/SUMMARY.md

@@ -72,24 +72,15 @@
         - [`TypeFolder` and `TypeFoldable`](./ty-fold.md)
         - [Generic arguments](./generic_arguments.md)
     - [Type inference](./type-inference.md)
-    - [Trait solving (old-style)](./traits/resolution.md)
+    - [Trait solving](./traits/resolution.md)
         - [Higher-ranked trait bounds](./traits/hrtb.md)
         - [Caching subtleties](./traits/caching.md)
         - [Specialization](./traits/specialization.md)
-    - [Trait solving (new-style)](./traits/index.md)
+        - [Chalk-based trait solving](./traits/chalk.md)
         - [Lowering to logic](./traits/lowering-to-logic.md)
-            - [Goals and clauses](./traits/goals-and-clauses.md)
-            - [Equality and associated types](./traits/associated-types.md)
-            - [Implied bounds](./traits/implied-bounds.md)
-            - [Region constraints](./traits/regions.md)
-            - [The lowering module in rustc](./traits/lowering-module.md)
-            - [Lowering rules](./traits/lowering-rules.md)
-            - [Well-formedness checking](./traits/wf.md)
+        - [Goals and clauses](./traits/goals-and-clauses.md)
         - [Canonical queries](./traits/canonical-queries.md)
-            - [Canonicalization](./traits/canonicalization.md)
-        - [The SLG solver](./traits/slg.md)
-        - [An Overview of Chalk](./traits/chalk-overview.md)
-        - [Bibliography](./traits/bibliography.md)
+        - [Lowering module in rustc](./traits/lowering-module.md)
     - [Type checking](./type-checking.md)
         - [Method Lookup](./method-lookup.md)
         - [Variance](./variance.md)

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>`) | [Trait Solving: Goals and Clauses]  |  [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)
 
@@ -43,4 +43,3 @@ Item            |  Kind    | Short description           | Chapter            |
 [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

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](../traits/goals-and-clauses.html#normalizeprojection---type).
 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).

src/traits/canonical-queries.md

@@ -7,7 +7,7 @@ would like to know the answer to – and in the
 checker or other parts of the system, may in the course of doing their
 thing want to know whether some trait is implemented for some type
 (e.g., is `u32: Debug` true?). Or they may want to
-[normalize some associated type](./associated-types.html).
+normalize some associated type.
 
 This section covers queries at a fairly high level of abstraction. The
 subsections look a bit more closely at how these ideas are implemented
@@ -104,9 +104,7 @@ trying to enumerate **all possible** answers for you, they are looking
 for an **unambiguous** answer. In particular, when they tell you the
 value for a type variable, that means that this is the **only possible
 instantiation** that you could use, given the current set of impls and
-where-clauses, that would be provable. (Internally within the solver,
-though, they can potentially enumerate all possible answers. See
-[the description of the SLG solver](./slg.html) for details.)
+where-clauses, that would be provable.
 
 The response to a trait query in rustc is typically a
 `Result<QueryResult<T>, NoSolution>` (where the `T` will vary a bit
@@ -130,10 +128,7 @@ we did find. It consists of four parts:
   - As we'll see in the example below, we can get back var values even
     for `Ambiguous` cases.
 - **Region constraints:** these are relations that must hold between
-  the lifetimes that you supplied as inputs. We'll ignore these here,
-  but see the
-  [section on handling regions in traits](./regions.html) for
-  more details.
+  the lifetimes that you supplied as inputs. We'll ignore these here.
 - **Value:** The query result also comes with a value of type `T`. For
   some specialized queries – like normalizing associated types –
   this is used to carry back an extra result, but it's often just